From: Alexey Kodanev Date: Tue, 6 Mar 2018 19:57:01 +0000 (+0300) Subject: dccp: check sk for closed state in dccp_sendmsg() X-Git-Tag: v4.1.12-124.31.3~693 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=98efd2b6edb623116fb63c69841d316dba25211e;p=users%2Fjedix%2Flinux-maple.git dccp: check sk for closed state in dccp_sendmsg() dccp_disconnect() sets 'dp->dccps_hc_tx_ccid' tx handler to NULL, therefore if DCCP socket is disconnected and dccp_sendmsg() is called after it, it will cause a NULL pointer dereference in dccp_write_xmit(). This crash and the reproducer was reported by syzbot. Looks like it is reproduced if commit 69c64866ce07 ("dccp: CVE-2017-8824: use-after-free in DCCP code") is applied. Reported-by: syzbot+f99ab3887ab65d70f816@syzkaller.appspotmail.com Signed-off-by: Alexey Kodanev Signed-off-by: David S. Miller (cherry picked from commit 67f93df79aeefc3add4e4b31a752600f834236e2) Orabug: 28001529 CVE: CVE-2018-1130 Reviewed-by: Darren Kenny Signed-off-by: Allen Pais Signed-off-by: Brian Maly --- diff --git a/net/dccp/proto.c b/net/dccp/proto.c index f32bed1d2977..ce206b27c32e 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -783,6 +783,11 @@ int dccp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) if (skb == NULL) goto out_release; + if (sk->sk_state == DCCP_CLOSED) { + rc = -ENOTCONN; + goto out_discard; + } + skb_reserve(skb, sk->sk_prot->max_header); rc = memcpy_from_msg(skb_put(skb, len), msg, len); if (rc != 0)