Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp348104ybi; Fri, 7 Jun 2019 09:02:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZGlbQqR5T4F/PWrsrToP5flvcdz6ppRh892yIPVUqMcUnIquYJeltY0GgAzfvwzawvODc X-Received: by 2002:a63:e304:: with SMTP id f4mr3436582pgh.187.1559923326904; Fri, 07 Jun 2019 09:02:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923326; cv=none; d=google.com; s=arc-20160816; b=HMgRG24QF9zyXySLEgPEG69ew/3kiud2126RlIEWqvErC2eJe1HkLBvRWWxI/A/xps 4tpJygb8wdZ78728ThZjFGPxv9ejOJNiN5EWezr22TdZT+tSLxxD18WVGOPjAon532SV H6tuRjSCIGlzbjSlrjz0kE77c7LkyeXU7/XU++PVc9ziYDVcuKUizomhxyu4Zso+NkXC GVCtIPo8aaozCNCIEHgc1jpW8VE5YzT2tqx7PacDAEpW7prKnDCBpBGMMZwLJuRqckwq ezPHtOT+Yt5IQszv4T0ZhEFgol2eOPThM+BP39bjXFyEDZwBjzC5RUoAfJcNnFgTOiFi VgBw== 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=svEmV/SN4mLdkZ0WGmT6sO+vH8zuLqfPwPkPD8B3q/g=; b=e5aFDMHNxm44Do/UChLKkBwLtafTQIi5W4iWP2onbZs4FtGbyeY4gZ9m0tgSHdeKKW iAiFEfXRM4iWgggJGQKcN0kc+k2JxnkVlpy4Gu5Q6MTn5vhJPB4lsRS8QuyJjMmydClx KzDOUnLPGy1hNSRs75vEuMKaE8C8j5/SJjqYzSGes4EPJyJz6jJT/crmktOtKm/rKTfs 9UgEMWYgpffaFDUdlDA7W6dJPWlnhHLArX8jcLY8lRSiYbVdkYtgwIFGfBKLUOonSGzy ONfPpRMvZE2r3eTnffsyUSxynVnU4+dG8gVXlpcU6rDuMmefMMwtC8RizVs1lGoJIvck 94WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="mz/cSUed"; 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 s11si2152761pgm.376.2019.06.07.09.01.48; Fri, 07 Jun 2019 09:02:06 -0700 (PDT) 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="mz/cSUed"; 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 S1730581AbfFGP6x (ORCPT + 99 others); Fri, 7 Jun 2019 11:58:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:52844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730536AbfFGPmT (ORCPT ); Fri, 7 Jun 2019 11:42:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 535282133D; Fri, 7 Jun 2019 15:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922138; bh=C0byHfkf1G8xmbejHAIrwBPScn8p+xmOkNkFaPbHxSM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mz/cSUed6dIHL8eN1m+nzV6Bd599rBNzYOXZEtD+3IdWPQJ1q3jmAvW3L/t/7o7b+ zw6Bs+yeJ20asPhAb1JoPNxXTasRuiQjtN2pnHy7KsoheVVB6ZIOSQ+Lkb6MVs2621 b6/UL7+fTaYkB3QzBh4CJnBBSjD9uYQdMBxh8VFU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhenliang Wei , Christian Brauner , Oleg Nesterov , "Eric W. Biederman" , Ivan Delalande , Arnd Bergmann , Thomas Gleixner , Deepa Dinamani , Andrew Morton , Linus Torvalds Subject: [PATCH 4.14 51/69] kernel/signal.c: trace_signal_deliver when signal_group_exit Date: Fri, 7 Jun 2019 17:39:32 +0200 Message-Id: <20190607153854.589064785@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Zhenliang Wei commit 98af37d624ed8c83f1953b1b6b2f6866011fc064 upstream. In the fixes commit, removing SIGKILL from each thread signal mask and executing "goto fatal" directly will skip the call to "trace_signal_deliver". At this point, the delivery tracking of the SIGKILL signal will be inaccurate. Therefore, we need to add trace_signal_deliver before "goto fatal" after executing sigdelset. Note: SEND_SIG_NOINFO matches the fact that SIGKILL doesn't have any info. Link: http://lkml.kernel.org/r/20190425025812.91424-1-weizhenliang@huawei.com Fixes: cf43a757fd4944 ("signal: Restore the stop PTRACE_EVENT_EXIT") Signed-off-by: Zhenliang Wei Reviewed-by: Christian Brauner Reviewed-by: Oleg Nesterov Cc: Eric W. Biederman Cc: Ivan Delalande Cc: Arnd Bergmann Cc: Thomas Gleixner Cc: Deepa Dinamani Cc: Greg Kroah-Hartman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- kernel/signal.c | 2 ++ 1 file changed, 2 insertions(+) --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2271,6 +2271,8 @@ relock: if (signal_group_exit(signal)) { ksig->info.si_signo = signr = SIGKILL; sigdelset(¤t->pending.signal, SIGKILL); + trace_signal_deliver(SIGKILL, SEND_SIG_NOINFO, + &sighand->action[SIGKILL - 1]); recalc_sigpending(); goto fatal; }