summaryrefslogtreecommitdiffstats
path: root/crypto/crypto_user.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-06-23 18:06:02 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-06-23 18:06:02 +0800
commitfd2efd93b6fcd981263477298cf1544b46683378 (patch)
tree44d74af32a3d367698524e860a54dabaa70ffcb9 /crypto/crypto_user.c
parent01ac94580ac2f7076394212ca963da7409016796 (diff)
downloadlinux-stable-fd2efd93b6fcd981263477298cf1544b46683378.tar.gz
linux-stable-fd2efd93b6fcd981263477298cf1544b46683378.tar.bz2
linux-stable-fd2efd93b6fcd981263477298cf1544b46683378.zip
Revert "crypto: user - no parsing of CRYPTO_MSG_GETALG"
This patch commit eed1e1afd8d542d9644534c1b712599b5d680007 as it is only a workaround for the real bug and the proper fix has now been applied as 055ddaace03580455a7b7dbea8e93d62acee61fc ("crypto: user - re-add size check for CRYPTO_MSG_GETALG"). Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/crypto_user.c')
-rw-r--r--crypto/crypto_user.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index f71960dea882..43fe85f20d57 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;