From: Ilya Lesokhin Date: Mon, 13 Nov 2017 08:22:49 +0000 (+0200) Subject: tls: don't override sk_write_space if tls_set_sw_offload fails. X-Git-Tag: v4.15-rc1~108^2~34^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee181e5201e640a4b92b217e9eab2531dab57d2c;p=thirdparty%2Flinux.git 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: 3c4d7559159b ('tls: kernel TLS support') Signed-off-by: Ilya Lesokhin Signed-off-by: David S. Miller --- diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index ab1bd167b63b9..e07ee3ae00230 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -401,9 +401,6 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval, 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 */ rc = tls_set_sw_offload(sk, ctx); 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; update_sk_prot(sk, ctx); + ctx->sk_write_space = sk->sk_write_space; + sk->sk_write_space = tls_write_space; goto out; err_crypto_info: