From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CD405138827 for ; Fri, 2 Oct 2015 12:08:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 534B4E0802; Fri, 2 Oct 2015 12:08:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6230E0802 for ; Fri, 2 Oct 2015 12:08:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3FC5340739 for ; Fri, 2 Oct 2015 12:08:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A8DB279 for ; Fri, 2 Oct 2015 12:08:15 +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: <1443787695.cb0333eb392976ebff5a7d56008620f7c0862790.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:4.1 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 2000_inet-deadlock-in-reqsk-queue-unlink-fix.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: cb0333eb392976ebff5a7d56008620f7c0862790 X-VCS-Branch: 4.1 Date: Fri, 2 Oct 2015 12:08:15 +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: 42932a1a-2ab7-45ce-8b0b-d39407e5335f X-Archives-Hash: 203dec577090dbae30121cc956a40597 commit: cb0333eb392976ebff5a7d56008620f7c0862790 Author: Mike Pagano gentoo org> AuthorDate: Fri Oct 2 12:08:15 2015 +0000 Commit: Mike Pagano gentoo org> CommitDate: Fri Oct 2 12:08:15 2015 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=cb0333eb inet: Patch to fix potential deadlock in reqsk_queue_unlink() 0000_README | 4 +++ 2000_inet-deadlock-in-reqsk-queue-unlink-fix.patch | 32 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/0000_README b/0000_README index 46b8cb0..348e8f5 100644 --- a/0000_README +++ b/0000_README @@ -91,6 +91,10 @@ Patch: 1600_dm-crypt-limit-max-segment-size.patch From: https://bugzilla.kernel.org/show_bug.cgi?id=104421 Desc: dm crypt: constrain crypt device's max_segment_size to PAGE_SIZE. +Patch: 2000_inet-deadlock-in-reqsk-queue-unlink-fix.patch +From: http://git.kernel.org/ +Desc: inet: Patch to fix potential deadlock in reqsk_queue_unlink() + Patch: 2700_ThinkPad-30-brightness-control-fix.patch From: Seth Forshee Desc: ACPI: Disable Windows 8 compatibility for some Lenovo ThinkPads. diff --git a/2000_inet-deadlock-in-reqsk-queue-unlink-fix.patch b/2000_inet-deadlock-in-reqsk-queue-unlink-fix.patch new file mode 100644 index 0000000..890f5e5 --- /dev/null +++ b/2000_inet-deadlock-in-reqsk-queue-unlink-fix.patch @@ -0,0 +1,32 @@ +From 83fccfc3940c4a2db90fd7e7079f5b465cd8c6af Mon Sep 17 00:00:00 2001 +From: Eric Dumazet +Date: Thu, 13 Aug 2015 15:44:51 -0700 +Subject: inet: fix potential deadlock in reqsk_queue_unlink() + +When replacing del_timer() with del_timer_sync(), I introduced +a deadlock condition : + +reqsk_queue_unlink() is called from inet_csk_reqsk_queue_drop() + +inet_csk_reqsk_queue_drop() can be called from many contexts, +one being the timer handler itself (reqsk_timer_handler()). + +In this case, del_timer_sync() loops forever. + +Simple fix is to test if timer is pending. + +Fixes: 2235f2ac75fd ("inet: fix races with reqsk timers") +Signed-off-by: Eric Dumazet +Signed-off-by: David S. Miller + +--- a/net/ipv4/inet_connection_sock.c 2015-10-02 07:49:42.759957268 -0400 ++++ b/net/ipv4/inet_connection_sock.c 2015-10-02 07:50:12.929957111 -0400 +@@ -584,7 +584,7 @@ static bool reqsk_queue_unlink(struct re + } + + spin_unlock(&queue->syn_wait_lock); +- if (del_timer_sync(&req->rsk_timer)) ++ if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer)) + reqsk_put(req); + return found; + }