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:
>
6 matches
Mail list logo
