Re: [PATCH net] dccp: check sk for closed state in dccp_sendmsg()

2018-03-07 Thread David Miller
From: Alexey Kodanev 
Date: Tue,  6 Mar 2018 22:57:01 +0300

> 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+f99ab3887ab65d70f...@syzkaller.appspotmail.com
> Signed-off-by: Alexey Kodanev 

Applied and queued up for -stable, thanks!


[PATCH net] dccp: check sk for closed state in dccp_sendmsg()

2018-03-06 Thread Alexey Kodanev
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+f99ab3887ab65d70f...@syzkaller.appspotmail.com
Signed-off-by: Alexey Kodanev 
---
 net/dccp/proto.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 15bdc00..84cd4e3 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -794,6 +794,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)
-- 
1.8.3.1