]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dccp: check sk for closed state in dccp_sendmsg()
authorAlexey Kodanev <alexey.kodanev@oracle.com>
Tue, 6 Mar 2018 19:57:01 +0000 (22:57 +0300)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:33:54 +0000 (21:33 -0400)
[ Upstream commit 67f93df79aeefc3add4e4b31a752600f834236e2 ]

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 <alexey.kodanev@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
net/dccp/proto.c

index a20dc23360f9e70e19260f2fac368adbb9e27ad6..be71e07ba6f19cedf0414f0042c1fc9f7ee53246 100644 (file)
@@ -790,6 +790,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)