[trusty/master-next,2/2] dccp: check sk for closed state in dccp_sendmsg()

Message ID 20180607083436.4594-4-apw@canonical.com
State New
Headers show
Series
  • [trusty/master-next,1/2] ipv6: dccp: add missing bind_conflict to dccp_ipv6_mapped
Related show

Commit Message

Andy Whitcroft June 7, 2018, 8:34 a.m.
From: Alexey Kodanev <alexey.kodanev@oracle.com>

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>

(cherry picked from commit 67f93df79aeefc3add4e4b31a752600f834236e2)
CVE-2018-1130
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 net/dccp/proto.c | 5 +++++
 1 file changed, 5 insertions(+)

Patch

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 8cfe2255f5e2..100676ab69ba 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -785,6 +785,11 @@  int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	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_fromiovec(skb_put(skb, len), msg->msg_iov, len);
 	if (rc != 0)