From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Eric W. Biederman" <ebiederm@xmission.com>,
David Miller <davem@davemloft.net>,
Matthias-Christian Ott <ott@mirix.org>
Subject: linux-next: manual merge of the crypto tree with Linus' tree
Date: Fri, 9 May 2014 12:07:02 +1000 [thread overview]
Message-ID: <20140509120702.62c609a3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1760 bytes --]
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
crypto/crypto_user.c between commit 90f62cf30a78 ("net: Use
netlink_ns_capable to verify the permisions of netlink messages") from
Linus' tree and commit c568398aa05f ("crypto: user - Allow
CRYPTO_MSG_GETALG without CAP_NET_ADMIN") from the crypto tree.
I fixed it up (I hope - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc crypto/crypto_user.c
index 43665d0d0905,aa906b8fdd17..000000000000
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@@ -265,6 -265,9 +265,9 @@@ static int crypto_update_alg(struct sk_
struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
LIST_HEAD(list);
- if (!capable(CAP_NET_ADMIN))
++ if (!netlink_capable(skb, CAP_NET_ADMIN))
+ return -EPERM;
+
if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
return -EINVAL;
@@@ -295,6 -298,9 +298,9 @@@ static int crypto_del_alg(struct sk_buf
struct crypto_alg *alg;
struct crypto_user_alg *p = nlmsg_data(nlh);
- if (!capable(CAP_NET_ADMIN))
++ if (!netlink_capable(skb, CAP_NET_ADMIN))
+ return -EPERM;
+
if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
return -EINVAL;
@@@ -379,6 -385,9 +385,9 @@@ static int crypto_add_alg(struct sk_buf
struct crypto_user_alg *p = nlmsg_data(nlh);
struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
- if (!capable(CAP_NET_ADMIN))
++ if (!netlink_capable(skb, CAP_NET_ADMIN))
+ return -EPERM;
+
if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
return -EINVAL;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-09 2:07 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 2:07 Stephen Rothwell [this message]
2014-05-09 12:51 ` linux-next: manual merge of the crypto tree with Linus' tree Herbert Xu
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 1:52 Stephen Rothwell
2021-06-15 1:39 Stephen Rothwell
2020-09-21 2:36 Stephen Rothwell
2020-05-11 3:23 Stephen Rothwell
2019-11-05 2:23 Stephen Rothwell
2019-08-23 3:08 Stephen Rothwell
2019-08-23 3:25 ` Nick Desaulniers
2019-06-11 2:07 Stephen Rothwell
2019-06-03 0:52 Stephen Rothwell
2014-04-17 2:57 Stephen Rothwell
2014-04-17 2:49 Stephen Rothwell
2012-05-07 2:31 Stephen Rothwell
2012-05-07 2:31 ` Stephen Rothwell
2012-05-07 4:20 ` Herbert Xu
2012-05-07 4:20 ` Herbert Xu
2012-05-07 2:11 Stephen Rothwell
2012-05-07 2:11 ` Stephen Rothwell
2012-05-07 4:16 ` Herbert Xu
2012-05-07 4:16 ` Herbert Xu
2012-05-07 8:09 ` Arnd Bergmann
2012-05-07 8:09 ` Arnd Bergmann
2012-05-07 9:04 ` Herbert Xu
2012-05-07 9:04 ` Herbert Xu
2012-05-07 11:02 ` Linus Walleij
2012-05-07 11:02 ` Linus Walleij
2010-04-14 1:48 Stephen Rothwell
2010-04-14 1:48 ` Stephen Rothwell
2010-04-14 3:14 ` Herbert Xu
2010-04-14 3:14 ` Herbert Xu
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=20140509120702.62c609a3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ott@mirix.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.