From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Morris <jmorris@namei.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
"Eric W. Biederman" <ebiederm@xmission.com>
Subject: Re: linux-next: manual merge of the security tree with Linus' tree
Date: Wed, 17 Oct 2012 11:52:17 +1100 [thread overview]
Message-ID: <20121017115217.0ffa47d478ea758aaaccab76@canb.auug.org.au> (raw)
In-Reply-To: <20121017114157.6abc8a3e1e6a62048addd52d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]
Hi James,
On Wed, 17 Oct 2012 11:41:57 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the security tree got a conflict in
> net/dns_resolver/dns_key.c between commit c6089735e724 ("userns: net:
> Call key_alloc with GLOBAL_ROOT_UID, GLOBAL_ROOT_GID instead of 0, 0")
> from Linus' tree and commit f8aa23a55f81 ("KEYS: Use keyring_alloc() to
> create special keyrings") from the security tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc net/dns_resolver/dns_key.c
> index 8aa4b11,b53bb4a..0000000
> --- a/net/dns_resolver/dns_key.c
> +++ b/net/dns_resolver/dns_key.c
> @@@ -259,11 -259,10 +259,11 @@@ static int __init init_dns_resolver(voi
> if (!cred)
> return -ENOMEM;
>
> - keyring = key_alloc(&key_type_keyring, ".dns_resolver",
> - keyring = keyring_alloc(".dns_resolver", 0, 0, cred,
> - (KEY_POS_ALL & ~KEY_POS_SETATTR) |
> - KEY_USR_VIEW | KEY_USR_READ,
> - KEY_ALLOC_NOT_IN_QUOTA, NULL);
> ++ keyring = keyring_alloc(".dns_resolver",
> + GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
> + (KEY_POS_ALL & ~KEY_POS_SETATTR) |
> + KEY_USR_VIEW | KEY_USR_READ,
> + KEY_ALLOC_NOT_IN_QUOTA);
Oops, there should be a ", NULL" before the closing parenthesis above. I
fixed that in my tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-10-17 0:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-17 0:41 linux-next: manual merge of the security tree with Linus' tree Stephen Rothwell
2012-10-17 0:52 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-21 3:20 Stephen Rothwell
2022-11-21 18:47 ` Paul Moore
2022-11-21 21:55 ` Stephen Rothwell
2022-11-21 23:09 ` Paul Moore
2022-09-01 2:27 Stephen Rothwell
2022-09-01 13:56 ` Paul Moore
2019-08-21 3:09 Stephen Rothwell
2019-08-21 3:05 Stephen Rothwell
2019-08-21 3:01 Stephen Rothwell
2019-08-21 3:18 ` Stephen Rothwell
2019-08-12 4:48 Stephen Rothwell
2015-08-04 1:14 Stephen Rothwell
2013-02-04 3:06 Stephen Rothwell
2013-01-21 2:12 Stephen Rothwell
2013-01-21 3:10 ` Mimi Zohar
2013-01-21 4:30 ` Stephen Rothwell
2012-10-17 0:41 Stephen Rothwell
2012-10-17 0:41 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=20121017115217.0ffa47d478ea758aaaccab76@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).