diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-27 17:07:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-27 17:07:22 -0400 |
| commit | 3f19f5cdb50b52d715a230e7f31e60b554bb24cc (patch) | |
| tree | 536d094702daa55cd1e276dcb851d55d3c407d93 | |
| parent | c95988cbe5cc089733b1288c210f62b15d9d5c4b (diff) | |
| parent | 8632e3ef18954d8afb635f759d753b9695f1e3fc (diff) | |
| download | linux-crypto-3f19f5cdb50b52d715a230e7f31e60b554bb24cc.tar.gz linux-crypto-3f19f5cdb50b52d715a230e7f31e60b554bb24cc.zip | |
Merge branch 'strict-netlink-validation'
Johannes Berg says:
====================
strict netlink validation
Here's a respin, with the following changes:
* change message when rejecting unknown attribute types (David Ahern)
* drop nl80211 patch - I'll apply it separately
* remove NL_VALIDATE_POLICY - we have a lot of calls to nla_parse()
that really should be without a policy as it has previously been
validated - need to find a good way to handle this later
* include the correct generic netlink change (d'oh, sorry)
====================
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | crypto/crypto_user_base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/crypto_user_base.c b/crypto/crypto_user_base.c index f25d3f32..e48da3b7 100644 --- a/crypto/crypto_user_base.c +++ b/crypto/crypto_user_base.c @@ -465,8 +465,8 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, return err; } - err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX, - crypto_policy, extack); + err = nlmsg_parse_deprecated(nlh, crypto_msg_min[type], attrs, + CRYPTOCFGA_MAX, crypto_policy, extack); if (err < 0) return err; |