From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB126139694 for ; Mon, 27 Feb 2017 18:32:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2202FE0CA2; Mon, 27 Feb 2017 18:32:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E50FFE0CA2 for ; Mon, 27 Feb 2017 18:32:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4FCC341134 for ; Mon, 27 Feb 2017 18:32:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18AED56A6 for ; Mon, 27 Feb 2017 18:32:29 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1488220341.ac25f59e51d3946b9aa4491fa0ad9768cac30701.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:3.10 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 1530_CVE-2017-6074-dccp-fix-early-skb-free.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: ac25f59e51d3946b9aa4491fa0ad9768cac30701 X-VCS-Branch: 3.10 Date: Mon, 27 Feb 2017 18:32:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 356646ba-f02f-48e9-850c-84205a2000a6 X-Archives-Hash: 07cd5e679bd5fa6f9301bb756c701400 commit: ac25f59e51d3946b9aa4491fa0ad9768cac30701 Author: Mike Pagano gentoo org> AuthorDate: Mon Feb 27 18:32:21 2017 +0000 Commit: Mike Pagano gentoo org> CommitDate: Mon Feb 27 18:32:21 2017 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=ac25f59e fix race condition in packet_set_ring. CVE-2016-8655. Bug #601926. 0000_README | 4 ++ 1530_CVE-2017-6074-dccp-fix-early-skb-free.patch | 47 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/0000_README b/0000_README index 1216723..3c1164c 100644 --- a/0000_README +++ b/0000_README @@ -478,6 +478,10 @@ Patch: 1520_fix-race-condition-in-packet-set-ring.patch From: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=84ac7260236a49c79eede91617700174c2c19b0c Desc: packet: fix race condition in packet_set_ring. CVE-2016-8655. Bug #601926. +Patch: 1530_CVE-2017-6074-dccp-skb-freeing-fix.patch +From:   https://bugs.gentoo.org/show_bug.cgi?id=610600                                                                                                                      +Desc: dccp: fix freeing skb too early for IPV6_RECVPKTINFO. CVE-2017-6074 + Patch: 1700_enable-thinkpad-micled.patch From: https://bugs.gentoo.org/show_bug.cgi?id=449248 Desc: Enable mic mute led in thinkpads diff --git a/1530_CVE-2017-6074-dccp-fix-early-skb-free.patch b/1530_CVE-2017-6074-dccp-fix-early-skb-free.patch new file mode 100644 index 0000000..433fd4b --- /dev/null +++ b/1530_CVE-2017-6074-dccp-fix-early-skb-free.patch @@ -0,0 +1,47 @@ +From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001 +From: Andrey Konovalov +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 +Acked-by: Eric Dumazet +Signed-off-by: David S. Miller +--- + 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 +