| Message ID | 20190810013623.14707-1-jakub.kicinski@netronome.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net/tls: swap sk_write_space on close | expand |
From: Jakub Kicinski <jakub.kicinski@netronome.com> Date: Fri, 9 Aug 2019 18:36:23 -0700 > Now that we swap the original proto and clear the ULP pointer > on close we have to make sure no callback will try to access > the freed state. sk_write_space is not part of sk_prot, remember > to swap it. > > Reported-by: syzbot+dcdc9deefaec44785f32@syzkaller.appspotmail.com > Fixes: 95fa145479fb ("bpf: sockmap/tls, close can race with map free") > Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Applied, thanks Jakub.
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 9cbbae606ced..ce6ef56a65ef 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -308,6 +308,7 @@ static void tls_sk_proto_close(struct sock *sk, long timeout) if (free_ctx) icsk->icsk_ulp_data = NULL; sk->sk_prot = ctx->sk_proto; + sk->sk_write_space = ctx->sk_write_space; write_unlock_bh(&sk->sk_callback_lock); release_sock(sk); if (ctx->tx_conf == TLS_SW)
Now that we swap the original proto and clear the ULP pointer on close we have to make sure no callback will try to access the freed state. sk_write_space is not part of sk_prot, remember to swap it. Reported-by: syzbot+dcdc9deefaec44785f32@syzkaller.appspotmail.com Fixes: 95fa145479fb ("bpf: sockmap/tls, close can race with map free") Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> --- net/tls/tls_main.c | 1 + 1 file changed, 1 insertion(+)