linux-kernel - Re: linux-next: manual merge of the integrity tree with the vfs 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160104031621.GP9938@ZenIV.linux.org.uk>
Date:	Mon, 4 Jan 2016 03:16:21 +0000
From:	Al Viro <viro@...IV.linux.org.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Mimi Zohar <zohar@...ux.vnet.ibm.com>,
	Dmitry Kasatkin <dmitry.kasatkin@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Petko Manolov <petkan@...-labs.com>
Subject: Re: linux-next: manual merge of the integrity tree with the vfs tree

On Mon, Jan 04, 2016 at 01:52:21PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the integrity 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:
> 
>   6427e6c71c8b ("ima: ima_write_policy() limit locking")
> 
> from the integrity tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

FWIW, I'm going to pull the part that introduces memdup_user_nul() into
a never-rebased branch and if security.git is willing to pull it and handle
that conversion in ima_write_policy() themselves, I'll be only glad to drop
the corresponding chunk in vfs.git#for-next
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/