From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2782C2BCA1 for ; Fri, 7 Jun 2019 15:54:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C882320657 for ; Fri, 7 Jun 2019 15:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922872; bh=bJKv8I6sI63y31Yb5PHStzUDtMTSJ2No5Qgf2jrHFoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U15smQKiF/MUOoXEaEi/atUPmovQM/+TGevs30zN+FxeBSmGVrQYmPmTKQWT94cp6 QDY98N/CEQtmFpxPagAEhnDvRDKLjoOnYzLi4SEONK4taq0h56AhBRstWNF/RBnRez JUlVfmJHX4slTbAkBHodMyFldWrKa2UUGh0bpgAs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729904AbfFGPy1 (ORCPT ); Fri, 7 Jun 2019 11:54:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:59394 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730778AbfFGPqv (ORCPT ); Fri, 7 Jun 2019 11:46:51 -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 45F58212F5; Fri, 7 Jun 2019 15:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922410; bh=bJKv8I6sI63y31Yb5PHStzUDtMTSJ2No5Qgf2jrHFoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mbJioWKWrXG0EHFcW0keNjj0Ym8SEm2Q4bPOjHqUI264TCjbmV1t+Y/5I1YH4XYtB djo4Z9srHqFcFK9sH6G9yUK2g8k7PqxkB0MtF3hX8BiF0UGiwZtF9QW4RkRSAdh9rM NdjoRlL/01BAipS4TW2s3Ry1Mztb+heXPnMItf3g= 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.19 41/73] kernel/signal.c: trace_signal_deliver when signal_group_exit Date: Fri, 7 Jun 2019 17:39:28 +0200 Message-Id: <20190607153853.731262451@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.669070800@linuxfoundation.org> References: <20190607153848.669070800@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -2436,6 +2436,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; }