diff mbox series

[2/3] tls: reset the crypto info if copy_from_user fails

Message ID 1518597968-72686-2-git-send-email-borisp@mellanox.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series [1/3] tls: retrun the correct IV in getsockopt | expand

Commit Message

Boris Pismenny Feb. 14, 2018, 8:46 a.m. UTC 
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>
---
 net/tls/tls_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller Feb. 14, 2018, 8:07 p.m. UTC | #1 
From: Boris Pismenny <borisp@mellanox.com>
Date: Wed, 14 Feb 2018 10:46:07 +0200

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

Applied.
diff mbox series

Patch

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index a6c3702..c105f86 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 */