From: Steve French <smfrench@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Morris <jmorris@namei.org>,
"linux-cifs@vger.kernel.org" <linux-cifs@vger.kernel.org>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Sachin Prabhu <sprabhu@redhat.com>,
David Howells <dhowells@redhat.com>
Subject: Re: linux-next: build failure after merge of the security tree
Date: Thu, 19 May 2016 22:07:10 -0500 [thread overview]
Message-ID: <CAH2r5mvJdYUFtQBkWqLQvOKSNUdK8YSGDRfpowiEffN9iTO3EQ@mail.gmail.com> (raw)
In-Reply-To: <20160520091447.1cba4885@canb.auug.org.au>
I fixed the build break (and some trivial compile warnings) due to the
change to the format of keyring_alloc and repushed the *"cifs: Create
dedicated keyring for spnego operations" patch to cifs-2.6.git
for-next
On Thu, May 19, 2016 at 6:14 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Steve,
>
> On Thu, 19 May 2016 14:01:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the security tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> fs/cifs/cifs_spnego.c: In function 'init_cifs_spnego':
>> fs/cifs/cifs_spnego.c:206:12: error: too few arguments to function 'keyring_alloc'
>> keyring = keyring_alloc(".cifs_spnego",
>> ^
>> In file included from include/linux/cred.h:17:0,
>> from include/linux/sched.h:56,
>> from include/linux/kasan.h:4,
>> from include/linux/slab.h:118,
>> from fs/cifs/cifs_spnego.c:23:
>> include/linux/key.h:302:20: note: declared here
>> extern struct key *keyring_alloc(const char *description, kuid_t uid, kgid_t gid,
>> ^
>>
>> Caused by commit
>>
>> 5b82c5cbcfe4 ("cifs: Create dedicated keyring for spnego operations")
>>
>> from the cifs tree interacting with commit
>>
>> 5ac7eace2d00 ("KEYS: Add a facility to restrict new links into a keyring")
>>
>> from the security tree.
>>
>> I added the following merge fix patch (and someone will have to let
>> Linus know):
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Thu, 19 May 2016 13:45:10 +1000
>> Subject: [PATCH] cifs: fix for keyringalloc() API change
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> fs/cifs/cifs_spnego.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
>> index 248ab431930c..9ef0dfcb2f95 100644
>> --- a/fs/cifs/cifs_spnego.c
>> +++ b/fs/cifs/cifs_spnego.c
>> @@ -207,7 +207,7 @@ init_cifs_spnego(void)
>> GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
>> (KEY_POS_ALL & ~KEY_POS_SETATTR) |
>> KEY_USR_VIEW | KEY_USR_READ,
>> - KEY_ALLOC_NOT_IN_QUOTA, NULL);
>> + KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL);
>> if (IS_ERR(keyring)) {
>> ret = PTR_ERR(keyring);
>> goto failed_put_cred;
>> --
>> 2.7.0
>
> The security tree has now been merged into Linus' tree, so this build
> breakage occurs when I merge the cifs tree. So you will need to tell
> Linus about this needed fixup when he merges the cifs tree.
>
> --
> Cheers,
> Stephen Rothwell
--
Thanks,
Steve
next prev parent reply other threads:[~2016-05-20 3:07 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-19 4:01 linux-next: build failure after merge of the security tree Stephen Rothwell
[not found] ` <20160519140120.23b345a1-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2016-05-19 10:11 ` David Howells
2016-05-19 23:14 ` Stephen Rothwell
2016-05-20 3:07 ` Steve French [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-08 4:00 Stephen Rothwell
2020-07-13 2:04 ` Stephen Rothwell
2020-07-13 2:06 ` Stephen Rothwell
2020-07-29 23:35 ` Stephen Rothwell
2020-07-30 2:35 ` James Morris
2020-07-30 2:59 ` Stephen Rothwell
2020-07-30 5:03 ` Stephen Rothwell
2020-08-04 3:36 ` James Morris
2019-08-12 4:58 Stephen Rothwell
2019-08-12 17:34 ` Kees Cook
2019-08-19 3:21 ` Stephen Rothwell
2019-08-19 3:38 ` Stephen Rothwell
2019-08-21 16:39 ` James Morris
2017-08-23 11:12 Stephen Rothwell
2017-08-17 2:51 Stephen Rothwell
2017-08-17 3:24 ` Kees Cook
2015-08-17 5:29 Stephen Rothwell
2015-08-17 6:04 ` Stephen Rothwell
2015-08-26 14:45 ` David Howells
2014-07-25 9:21 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAH2r5mvJdYUFtQBkWqLQvOKSNUdK8YSGDRfpowiEffN9iTO3EQ@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sprabhu@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).