Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1300434

Re: linux-next: manual merge of the security tree with the vfs tree

Show all headers | View raw

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:
> 
>   38d859f991f3 ("IMA: policy can now be updated multiple times")
> 
> from the security tree.
> 
> I fixed it up (hopefully, see below) and can carry the fix as necessary
> (no action is required).

Hi Stephen,

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.  How do you want to handle it?  Do I need to do
anything?

Thanks!

Mimi

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the security tree with the vfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-31 05:30 +0100
  Re: linux-next: manual merge of the security tree with the vfs tree Al Viro <viro@ZenIV.linux.org.uk> - 2015-12-31 05:40 +0100
    Re: linux-next: manual merge of the security tree with the vfs tree Petko Manolov <petkan@mip-labs.com> - 2015-12-31 11:50 +0100
      Re: linux-next: manual merge of the security tree with the vfs tree Al Viro <viro@ZenIV.linux.org.uk> - 2016-01-01 05:40 +0100
        Re: linux-next: manual merge of the security tree with the vfs tree Petko Manolov <petkan@mip-labs.com> - 2016-01-01 18:30 +0100
          Re: [PATCH] ima_write_policy() optimizations; kbuild test robot <lkp@intel.com> - 2016-01-01 18:50 +0100
  Re: linux-next: manual merge of the security tree with the vfs tree Mimi Zohar <zohar@linux.vnet.ibm.com> - 2016-01-04 02:40 +0100
    Re: linux-next: manual merge of the security tree with the vfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-04 03:00 +0100

csiph-web