tls: reset the crypto info if copy_from_user fails

Boris Pismenny · davem330 · commit 257082e6ae23 · 2018-02-14T15:05:19.000-05:00
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: 3c4d755 ("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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ static int do_tls_setsockopt_tx(struct sock sk, char __user optval,`
`376`	`376`	`rc = copy_from_user(crypto_info, optval, sizeof(*crypto_info));`
`377`	`377`	`if (rc) {`
`378`	`378`	`rc = -EFAULT;`
`379`		`- goto out;`
	`379`	`+ goto err_crypto_info;`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`/* check version */`