* linux-next: manual merge of the security tree with the file-locks tree
@ 2014-09-19 3:13 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-09-19 3:13 UTC (permalink / raw)
To: James Morris, Jeff Layton
Cc: linux-next, linux-kernel, Christoph Hellwig, Lukasz Pawelczyk
[-- Attachment #1: Type: text/plain, Size: 908 bytes --]
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@canb•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;
}
/**
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-19 3:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-19 3:13 linux-next: manual merge of the security tree with the file-locks tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox