diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-06-23 18:06:02 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-06-23 18:06:02 +0800 |
commit | 5c68a72aaa28888f8a326ec4ee53e5e42b61b3aa (patch) | |
tree | 8d1fdbaf243741674f3c406cb6d0b8046fcee77e /crypto | |
parent | b7185c98aff3d9504ad56e4178513ce61d66e59a (diff) | |
download | linux-crypto-5c68a72aaa28888f8a326ec4ee53e5e42b61b3aa.tar.gz linux-crypto-5c68a72aaa28888f8a326ec4ee53e5e42b61b3aa.zip |
Revert "crypto: user - no parsing of CRYPTO_MSG_GETALG"
This patch commit 5cec70e9bcd56bf924c6b08cad3db16fb54e1c0d as
it is only a workaround for the real bug and the proper fix has
now been applied as af900a7ee6a17784a9a343421ef0e3fe67f264fc
("crypto: user - re-add size check for CRYPTO_MSG_GETALG").
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/crypto_user.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c index f71960de..43fe85f2 100644 --- a/crypto/crypto_user.c +++ b/crypto/crypto_user.c @@ -516,12 +516,10 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) return err; } - if (type != (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE)) { - err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, - CRYPTOCFGA_MAX, crypto_policy); - if (err < 0) - return err; - } + err = nlmsg_parse(nlh, crypto_msg_min[type], attrs, CRYPTOCFGA_MAX, + crypto_policy); + if (err < 0) + return err; if (link->doit == NULL) return -EINVAL; |