Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751030AbdFTFjk (ORCPT ); Tue, 20 Jun 2017 01:39:40 -0400 Received: from mail-it0-f45.google.com ([209.85.214.45]:37624 "EHLO mail-it0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750960AbdFTFji (ORCPT ); Tue, 20 Jun 2017 01:39:38 -0400 MIME-Version: 1.0 In-Reply-To: <20170620145655.4b7f3efb@canb.auug.org.au> References: <20170620145655.4b7f3efb@canb.auug.org.au> From: Kees Cook Date: Mon, 19 Jun 2017 22:39:36 -0700 Message-ID: Subject: Re: linux-next: build failure after merge of the kspp tree To: Stephen Rothwell Cc: James Morris , Linux-Next Mailing List , Linux Kernel Mailing List , John Johansen Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3380 Lines: 75 On Mon, Jun 19, 2017 at 9:56 PM, Stephen Rothwell wrote: > Hi all, > > After merging the kspp tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > security/apparmor/file.c: In function 'aa_path_link': > security/apparmor/file.c:475:23: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] > struct path link = { new_dir->mnt, new_dentry }; > ^ > security/apparmor/file.c:475:23: note: (near initialization for 'link') > security/apparmor/file.c:475:37: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] > struct path link = { new_dir->mnt, new_dentry }; > ^ > security/apparmor/file.c:475:37: note: (near initialization for 'link') > security/apparmor/file.c:476:25: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] > struct path target = { new_dir->mnt, old_dentry }; > ^ > security/apparmor/file.c:476:25: note: (near initialization for 'target') > security/apparmor/file.c:476:39: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] > struct path target = { new_dir->mnt, old_dentry }; > ^ > security/apparmor/file.c:476:39: note: (near initialization for 'target') > > Caused by commit > > 1a12979f61e4 ("randstruct: Mark various structs for randomization") > > interacting with commit > > 8014370f1257 ("apparmor: move path_link mediation to using labels") > > from the security tree. > > I added the following merge fix patch for today: > > From: Stephen Rothwell > Date: Tue, 20 Jun 2017 14:50:36 +1000 > Subject: [PATCH] apparmor: put back designators in struct initialisers > > Fixes: 8014370f1257 ("apparmor: move path_link mediation to using labels") > Signed-off-by: Stephen Rothwell > --- > security/apparmor/file.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/security/apparmor/file.c b/security/apparmor/file.c > index b6e8e5b11e05..3382518b87fa 100644 > --- a/security/apparmor/file.c > +++ b/security/apparmor/file.c > @@ -472,8 +472,8 @@ static int profile_path_link(struct aa_profile *profile, > int aa_path_link(struct aa_label *label, struct dentry *old_dentry, > const struct path *new_dir, struct dentry *new_dentry) > { > - struct path link = { new_dir->mnt, new_dentry }; > - struct path target = { new_dir->mnt, old_dentry }; > + struct path link = { .mnt = new_dir->mnt, .dentry = new_dentry }; > + struct path target = { .mnt = new_dir->mnt, .dentry = old_dentry }; > struct path_cond cond = { > d_backing_inode(old_dentry)->i_uid, > d_backing_inode(old_dentry)->i_mode > -- > 2.11.0 Thanks for the fix! That looks correct to me. It seems the refactoring in 8014370f1257 ("apparmor: move path_link mediation to using labels") didn't take 8486adf0d755 ("apparmor: use designated initializers") into account. John, if this looks okay, can you Ack it for James to carry in security-next? -Kees -- Kees Cook Pixel Security