From: Boris Pismenny <borisp@mellanox.com>
Date: Wed, 14 Feb 2018 08:46:07 +0000 (+0200)
Subject: tls: reset the crypto info if copy_from_user fails
X-Git-Tag: v4.16-rc3~29^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=257082e6ae23e92898440f6bcb2857555bf7957c;p=thirdparty%2Fkernel%2Flinux.git

tls: reset the crypto info if copy_from_user fails

copy_from_user could copy some partial information, as a result
TLS_CRYPTO_INFO_READY(crypto_info) could be true while crypto_info is
using uninitialzed data.

This patch resets crypto_info when copy_from_user fails.

fixes: 3c4d7559159b ("tls: kernel TLS support")
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index a6c3702e0ddbb..c105f86a7ea62 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -376,7 +376,7 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval,
 	rc = copy_from_user(crypto_info, optval, sizeof(*crypto_info));
 	if (rc) {
 		rc = -EFAULT;
-		goto out;
+		goto err_crypto_info;
 	}
 
 	/* check version */