summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorIlya Lesokhin <ilyal@mellanox.com>2017-11-13 11:22:49 +0300
committerDavid S. Miller <davem@davemloft.net>2017-11-14 10:26:35 +0300
commitee181e5201e640a4b92b217e9eab2531dab57d2c (patch)
treed0d4e6feae47f3b33d9f2672ba4828a63364ea6e /net
parent196c31b4b54474b31dee3c30352c45c2a93e9226 (diff)
downloadlinux-ee181e5201e640a4b92b217e9eab2531dab57d2c.tar.xz
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 <ilyal@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/tls/tls_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index ab1bd167b63b..e07ee3ae0023 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: