|
 |
037a83a |
From 69c64866ce072dea1d1e59a0d61e0f66c0dffb76 Mon Sep 17 00:00:00 2001
|
|
|
037a83a |
Message-Id: <69c64866ce072dea1d1e59a0d61e0f66c0dffb76.1513103764.git.jeremy@jcline.org>
|
|
|
037a83a |
From: Mohamed Ghannam <simo.ghannam@gmail.com>
|
|
|
037a83a |
Date: Tue, 5 Dec 2017 20:58:35 +0000
|
|
|
037a83a |
Subject: [PATCH] dccp: CVE-2017-8824: use-after-free in DCCP code
|
|
|
037a83a |
|
|
|
037a83a |
Whenever the sock object is in DCCP_CLOSED state,
|
|
|
037a83a |
dccp_disconnect() must free dccps_hc_tx_ccid and
|
|
|
037a83a |
dccps_hc_rx_ccid and set to NULL.
|
|
|
037a83a |
|
|
|
037a83a |
Signed-off-by: Mohamed Ghannam <simo.ghannam@gmail.com>
|
|
|
037a83a |
Reviewed-by: Eric Dumazet <edumazet@google.com>
|
|
|
037a83a |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
037a83a |
---
|
|
|
037a83a |
net/dccp/proto.c | 5 +++++
|
|
|
037a83a |
1 file changed, 5 insertions(+)
|
|
|
037a83a |
|
|
|
037a83a |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
|
|
|
037a83a |
index b68168fcc06a..9d43c1f40274 100644
|
|
|
037a83a |
--- a/net/dccp/proto.c
|
|
|
037a83a |
+++ b/net/dccp/proto.c
|
|
|
037a83a |
@@ -259,6 +259,7 @@ int dccp_disconnect(struct sock *sk, int flags)
|
|
|
037a83a |
{
|
|
|
037a83a |
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
037a83a |
struct inet_sock *inet = inet_sk(sk);
|
|
|
037a83a |
+ struct dccp_sock *dp = dccp_sk(sk);
|
|
|
037a83a |
int err = 0;
|
|
|
037a83a |
const int old_state = sk->sk_state;
|
|
|
037a83a |
|
|
|
037a83a |
@@ -278,6 +279,10 @@ int dccp_disconnect(struct sock *sk, int flags)
|
|
|
037a83a |
sk->sk_err = ECONNRESET;
|
|
|
037a83a |
|
|
|
037a83a |
dccp_clear_xmit_timers(sk);
|
|
|
037a83a |
+ ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk);
|
|
|
037a83a |
+ ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk);
|
|
|
037a83a |
+ dp->dccps_hc_rx_ccid = NULL;
|
|
|
037a83a |
+ dp->dccps_hc_tx_ccid = NULL;
|
|
|
037a83a |
|
|
|
037a83a |
__skb_queue_purge(&sk->sk_receive_queue);
|
|
|
037a83a |
__skb_queue_purge(&sk->sk_write_queue);
|
|
|
037a83a |
--
|
|
|
037a83a |
2.14.3
|
|
|
037a83a |
|