Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee181e52 authored by Ilya Lesokhin's avatar Ilya Lesokhin Committed by David S. Miller
Browse files

tls: don't override sk_write_space if tls_set_sw_offload fails. 



If we fail to enable tls in the kernel we shouldn't override
the sk_write_space callback

Fixes: 3c4d7559 ('tls: kernel TLS support')
Signed-off-by: default avatarIlya Lesokhin <ilyal@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 196c31b4

net/tls/tls_main.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -401,9 +401,6 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval, 
		goto out;

		goto out;

	}

	}





	ctx->sk_write_space = sk->sk_write_space;

	sk->sk_write_space = tls_write_space;



	/* currently SW is default, we will have ethtool in future */

	/* currently SW is default, we will have ethtool in future */

	rc = tls_set_sw_offload(sk, ctx);

	rc = tls_set_sw_offload(sk, ctx);

	tx_conf = TLS_SW_TX;

	tx_conf = TLS_SW_TX;
@@ -412,6 +409,8 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval, 




	ctx->tx_conf = tx_conf;

	ctx->tx_conf = tx_conf;

	update_sk_prot(sk, ctx);

	update_sk_prot(sk, ctx);

	ctx->sk_write_space = sk->sk_write_space;

	sk->sk_write_space = tls_write_space;

	goto out;

	goto out;





err_crypto_info:

err_crypto_info: