diff options
| author | Arkadiusz Miśkiewicz | 2017-02-23 12:04:27 (GMT) |
|---|---|---|
| committer | Arkadiusz Miśkiewicz | 2017-02-23 12:04:27 (GMT) |
| commit | be0197d4c82709afe2fbe00f21d6c91e5990a5ce (patch) | |
| tree | 7a04af07d3fabe170b100fabb365cc97af6a3729 /kernel-small_fixes.patch | |
| parent | f0a6c0dbd794e0231e70a0e9c0063fcf48ce69e8 (diff) | |
| download | kernel-be0197d4c82709afe2fbe00f21d6c91e5990a5ce.zip kernel-be0197d4c82709afe2fbe00f21d6c91e5990a5ce.tar.gz | |
- rel 2; fixes CVE-2017-6074 (local root)auto/th/kernel-4.9.11-2
Diffstat (limited to 'kernel-small_fixes.patch')
| -rw-r--r-- | kernel-small_fixes.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 319191c..26fde24 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -61,3 +61,50 @@ index 098ce9b179ee..fcf8d0aa66ec 100644 -- 2.11.0 +From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001 +From: Andrey Konovalov <andreyknvl@google.com> +Date: Thu, 16 Feb 2017 17:22:46 +0100 +Subject: dccp: fix freeing skb too early for IPV6_RECVPKTINFO + +In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet +is forcibly freed via __kfree_skb in dccp_rcv_state_process if +dccp_v6_conn_request successfully returns. + +However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb +is saved to ireq->pktopts and the ref count for skb is incremented in +dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed +in dccp_rcv_state_process. + +Fix by calling consume_skb instead of doing goto discard and therefore +calling __kfree_skb. + +Similar fixes for TCP: + +fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed. +0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now +simply consumed + +Signed-off-by: Andrey Konovalov <andreyknvl@google.com> +Acked-by: Eric Dumazet <edumazet@google.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/dccp/input.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/dccp/input.c b/net/dccp/input.c +index ba34718..8fedc2d 100644 +--- a/net/dccp/input.c ++++ b/net/dccp/input.c +@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, + if (inet_csk(sk)->icsk_af_ops->conn_request(sk, + skb) < 0) + return 1; +- goto discard; ++ consume_skb(skb); ++ return 0; + } + if (dh->dccph_type == DCCP_PKT_RESET) + goto discard; +-- +cgit v0.12 + |