]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
tls: don't override sk_write_space if tls_set_sw_offload fails.
authorIlya Lesokhin <ilyal@mellanox.com>
Mon, 13 Nov 2017 08:22:49 +0000 (10:22 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Nov 2017 07:26:35 +0000 (16:26 +0900)
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>
net/tls/tls_main.c

index ab1bd167b63b900af86c6e06a45f0685104cee73..e07ee3ae002300932f8fd41a907cee2fc042738f 100644 (file)
@@ -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: