From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751552AbcADFGv (ORCPT <rfc822;w@1wt.eu>);
	Mon, 4 Jan 2016 00:06:51 -0500
Received: from e28smtp03.in.ibm.com ([125.16.236.3]:39442 "EHLO
	e28smtp03.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750759AbcADFGt (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 4 Jan 2016 00:06:49 -0500
X-IBM-Helo: d28dlp03.in.ibm.com
X-IBM-MailFrom: zohar@linux.vnet.ibm.com
X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-next@vger.kernel.org
Message-ID: <1451883997.2772.27.camel@linux.vnet.ibm.com>
Subject: Re: linux-next: manual merge of the integrity tree with the vfs tree
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
        Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Petko Manolov <petkan@mip-labs.com>, James Morris <jmorris@namei.org>
Date: Mon, 04 Jan 2016 00:06:37 -0500
In-Reply-To: <20160104031621.GP9938@ZenIV.linux.org.uk>
References: <20160104135221.0e5515ac@canb.auug.org.au>
	 <20160104031621.GP9938@ZenIV.linux.org.uk>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.12.11 (3.12.11-1.fc21) 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
X-TM-AS-MML: disable
X-Content-Scanned: Fidelis XPS MAILER
x-cbid: 16010405-0009-0000-0000-000009C1FE77
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 2016-01-04 at 03:16 +0000, Al Viro wrote:
> 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).

Thanks!

> 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

Al,

As memdup_user_nul() is not in the security tree, it would break the
security tree builds.  Having the patch in the linux-integrity/next
branch wouldn't help matters.

Mimi