Hi all,
Today's linux-next merge of the security tree got a conflict in:
fs/tracefs/inode.c
between commit:
67782f8ae148 ("vfs: Convert tracefs to use the new mount API")
from the vfs tree and commit:
757ff7244358 ("tracefs: Restrict tracefs when the kernel is locked down")
from the se
Hi Mimi,
On Sun, 03 Jan 2016 20:37:20 -0500 Mimi Zohar wrote:
>
> FYI, I pushed out Petko's patch to linux-integrity/next earlier today.
> His patch moves taking the ima_write_mutex to after the the call to
> copy_from_user(), as discussed. This obviously won't fix the conflict
> with Al's patch
On Thu, 2015-12-31 at 15:24 +1100, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the security tree got a conflict in:
>
> security/integrity/ima/ima_fs.c
>
> between commit:
>
> 3bc8f29b149e ("new helper: memdup_user_nul()")
>
> from the vfs tree and commit:
>
> 38
On 16-01-01 04:34:16, Al Viro wrote:
> On Thu, Dec 31, 2015 at 12:45:35PM +0200, Petko Manolov wrote:
>
> > I introduced the write mutex when ima_write_policy() stopped being
> > serialized by
> > other means. Come to think about it the semaphore could be taken right
> > before
> > copy_from_
On Thu, Dec 31, 2015 at 12:45:35PM +0200, Petko Manolov wrote:
> I introduced the write mutex when ima_write_policy() stopped being serialized
> by
> other means. Come to think about it the semaphore could be taken right
> before
> copy_from_user() so it is my fault, not Stephen's.
s/before/
On 15-12-31 04:30:19, Al Viro wrote:
> On Thu, Dec 31, 2015 at 03:24:53PM +1100, Stephen Rothwell wrote:
> > Hi James,
> >
> > Today's linux-next merge of the security tree got a conflict in:
> >
> > security/integrity/ima/ima_fs.c
> >
> > between commit:
> >
> > 3bc8f29b149e ("new helper:
On Thu, Dec 31, 2015 at 03:24:53PM +1100, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the security tree got a conflict in:
>
> security/integrity/ima/ima_fs.c
>
> between commit:
>
> 3bc8f29b149e ("new helper: memdup_user_nul()")
>
> from the vfs tree and commit:
>
Hi James,
Today's linux-next merge of the security tree got a conflict in:
security/integrity/ima/ima_fs.c
between commit:
3bc8f29b149e ("new helper: memdup_user_nul()")
from the vfs tree and commit:
38d859f991f3 ("IMA: policy can now be updated multiple times")
from the security tree.
Hi James,
Today's linux-next merge of the security tree got a conflict in
include/linux/security.h and security/security.c between commits
37882db0546c ("SECURITY: remove nameidata arg from inode_follow_link")
and bda0be7ad994 ("security: make inode_follow_link RCU-walk aware")
from the vfs tree a
Hi James,
Today's linux-next merge of the security tree got a conflict in
security/capability.c between commits 37882db0546c ("SECURITY: remove
nameidata arg from inode_follow_link") and bda0be7ad994 ("security:
make inode_follow_link RCU-walk aware") from the vfs tree and commit
1ddd3b4e07a4 ("LS
Hi James,
Today's linux-next merge of the security tree got a conflict in
init/main.c between commit 87fb64a6c1f7 ("take the targets
of /proc/*/ns/* symlinks to separate fs") from the vfs tree and commit
c9cd2ce2bc63 ("integrity: provide a hook to load keys when rootfs is
ready") from the security
11 matches
Mail list logo
