Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp700635imj; Wed, 13 Feb 2019 16:02:57 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib/4M5AdSiatHlkU7McZC5OphWDbKLDmE2ypWZ5rgOLVii/x6Mr+IBeKYgbWiTj/SPAGRN6 X-Received: by 2002:a17:902:7204:: with SMTP id ba4mr946013plb.186.1550102577774; Wed, 13 Feb 2019 16:02:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550102577; cv=none; d=google.com; s=arc-20160816; b=zBKB+hUbk01vUiyQ4prYTDq7WxlNisSACKF97ePhsN0WbMX8P8qQ9oKbOsvbxfxH5f dBi8olnDjIzcFy3rLHeG8fMbVerhcw5gzCVz1F7uDpuXIkoH9/CE77GqxbhhihoKljHU GZQ1F372USsQD9cI63xOi36tsERO/1Dt6vRsPzNjTAHW+TJip7FCtrNf1kUL/F4MhfNe oGb7yo7DvdhN/atmtyh80v/C38AD3PupN3bKsLdILhGxNfwfrtKuA0CDwPFGKB4CWh0P /Pjh0YLj0ksBDgtJZmOIU16hiBFZo/F6RDPG9jEuvUGeeYIZVRGgIvKLt8cjuOEABLW+ LgkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XHXcbelP8yh93Y99G7udAiIQ3nyehWI9UKlHjvoenVw=; b=KMPmnaHxean8ccFFop40+4Le/s/OqXlBfem0ge3EdHFlF7D+cVDXGc3VB+6JEUcbTl 1iGmX5ndA7NZhMjY9kOarqajHsFuyE8506gXJa/DItqLFv+uDLmrIRZO0gZg9fz9Quyp PkQqH96zTxMc0vCrWgAPkXl1t1fIzpek179d7wkWAQSqvO9wJG2/uapa/wgiaYb4ywtj 08oOKieHkx3ruN5NKbCIMCPMtd2jIL2CfZPiHqDV0ABvaYTrIeGTUSWJHE9UxfMTkbto HFvmYkhmtu8lIXIQ6V/lBUkyoJNJ1GdD8A9znRL0LZ8dApGKDyARJvZLP/BlUADa/QeJ xb1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HU0MNYSp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 19si716114pgq.215.2019.02.13.16.02.41; Wed, 13 Feb 2019 16:02:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HU0MNYSp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405616AbfBMSmQ (ORCPT + 99 others); Wed, 13 Feb 2019 13:42:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:40718 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405596AbfBMSmM (ORCPT ); Wed, 13 Feb 2019 13:42:12 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 330C2222D6; Wed, 13 Feb 2019 18:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550083331; bh=eZSN8p9lGkxGMCBDN9E5iOvbOUXte7CGSqPGZoI3TeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HU0MNYSpUdekEKJs+Js1q6F0/8GpJCjaTTjLVaKDnWG0SAniyCiq7SDcq09/9T1bJ TdczavZLadejQK/x9JFoXf+ePhUvv9/Ohq8NOxRI7ORQf1s3ZDeK17PH7YoIKXa6aq /wcFJeLo1Nv9diA26KVvV4mwsFPKjzZFJ87uFjmQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Vyukov , "Eric W. Biederman" Subject: [PATCH 4.14 04/35] signal: Always notice exiting tasks Date: Wed, 13 Feb 2019 19:37:59 +0100 Message-Id: <20190213183706.388641883@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190213183706.176685027@linuxfoundation.org> References: <20190213183706.176685027@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric W. Biederman commit 35634ffa1751b6efd8cf75010b509dcb0263e29b upstream. Recently syzkaller was able to create unkillablle processes by creating a timer that is delivered as a thread local signal on SIGHUP, and receiving SIGHUP SA_NODEFERER. Ultimately causing a loop failing to deliver SIGHUP but always trying. Upon examination it turns out part of the problem is actually most of the solution. Since 2.5 signal delivery has found all fatal signals, marked the signal group for death, and queued SIGKILL in every threads thread queue relying on signal->group_exit_code to preserve the information of which was the actual fatal signal. The conversion of all fatal signals to SIGKILL results in the synchronous signal heuristic in next_signal kicking in and preferring SIGHUP to SIGKILL. Which is especially problematic as all fatal signals have already been transformed into SIGKILL. Instead of dequeueing signals and depending upon SIGKILL to be the first signal dequeued, first test if the signal group has already been marked for death. This guarantees that nothing in the signal queue can prevent a process that needs to exit from exiting. Cc: stable@vger.kernel.org Tested-by: Dmitry Vyukov Reported-by: Dmitry Vyukov Ref: ebf5ebe31d2c ("[PATCH] signal-fixes-2.5.59-A4") History Tree: https://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git Signed-off-by: "Eric W. Biederman" Signed-off-by: Greg Kroah-Hartman --- kernel/signal.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2225,6 +2225,11 @@ relock: goto relock; } + /* Has this task already been marked for death? */ + ksig->info.si_signo = signr = SIGKILL; + if (signal_group_exit(signal)) + goto fatal; + for (;;) { struct k_sigaction *ka; @@ -2320,6 +2325,7 @@ relock: continue; } + fatal: spin_unlock_irq(&sighand->siglock); /*