linux-kernel - linux-next: manual merge of the security tree with the file-locks tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 19 Sep 2014 13:13:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Morris <jmorris@...ei.org>,
	Jeff Layton <jlayton@...chiereds.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>,
	Lukasz Pawelczyk <l.pawelczyk@...sung.com>
Subject: linux-next: manual merge of the security tree with the file-locks
 tree

Hi James,

Today's linux-next merge of the security tree got a conflict in
security/smack/smack_lsm.c between commit 1f5a9ba7910c ("security: make
security_file_set_fowner, f_setown and __f_setown void return") from
the file-locks tree and commit 21c7eae21a21 ("Make Smack operate on
smack_known struct where it still used char*") from the security tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc security/smack/smack_lsm.c
index 69e5635d89e5,93dc876734a4..000000000000
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@@ -1394,7 -1574,8 +1574,7 @@@ static void smack_file_set_fowner(struc
  {
  	struct smack_known *skp = smk_of_current();

- 	file->f_security = skp->smk_known;
+ 	file->f_security = skp;
 -	return 0;
  }

  /**

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)