提交 d85f0177 编写于 作者: J John Fastabend 提交者: David S. Miller

net: tls, fix sk_write_space NULL write when tx disabled

The ctx->sk_write_space pointer is only set when TLS tx mode is enabled.
When running without TX mode its a null pointer but we still set the
sk sk_write_space pointer on close().

Fix the close path to only overwrite sk->sk_write_space when the current
pointer is to the tls_write_space function indicating the tls module should
clean it up properly as well.
Reported-by: NHillf Danton <hdanton@sina.com>
Cc: Ying Xue <ying.xue@windriver.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Fixes: 57c722e9 ("net/tls: swap sk_write_space on close")
Signed-off-by: NJohn Fastabend <john.fastabend@gmail.com>
Reviewed-by: NJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 6f967f8b
...@@ -308,7 +308,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout) ...@@ -308,7 +308,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)
if (free_ctx) if (free_ctx)
icsk->icsk_ulp_data = NULL; icsk->icsk_ulp_data = NULL;
sk->sk_prot = ctx->sk_proto; sk->sk_prot = ctx->sk_proto;
sk->sk_write_space = ctx->sk_write_space; if (sk->sk_write_space == tls_write_space)
sk->sk_write_space = ctx->sk_write_space;
write_unlock_bh(&sk->sk_callback_lock); write_unlock_bh(&sk->sk_callback_lock);
release_sock(sk); release_sock(sk);
if (ctx->tx_conf == TLS_SW) if (ctx->tx_conf == TLS_SW)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册