From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 23 Jun 2016 10:06:02 +0000 (+0800)
Subject: Revert "crypto: user - no parsing of CRYPTO_MSG_GETALG"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd2efd93b6fcd981263477298cf1544b46683378;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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;