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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 1A64DC31E40 for ; Tue, 6 Aug 2019 21:34:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D824521872 for ; Tue, 6 Aug 2019 21:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127256; bh=1dnYI/3MT890Qsd/tNhEdkKwlKhwvfGuHH4UYCwVyWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Lz4D2jxSHuT+MUa39pNw/Dj6MckYi7qy40Db8RreTHVXpiOqcl1woRvt2Alv3qQFy buF/EMhjRhZDA/QMB8PBnKznJRTwOU54vtNHZS0DbjuLsxyk3dcP64KtC7XzjODMv/ c3BD4zSy475iIqAebQpWRGQY+BAZjODjKmA59yxg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727582AbfHFVeO (ORCPT ); Tue, 6 Aug 2019 17:34:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:51980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726375AbfHFVeI (ORCPT ); Tue, 6 Aug 2019 17:34:08 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5084B217D7; Tue, 6 Aug 2019 21:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127247; bh=1dnYI/3MT890Qsd/tNhEdkKwlKhwvfGuHH4UYCwVyWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FlFvwqll7qCvgevWuJ7iUlOzZhZcnx0sRwDa41DD5hlPkemInjXqqLZ9sY6UExdg9 ag8Qr+rMW8pi8GYrodVBpJtGchNC/kZ76vgLe52PBqZywx1to7ExukdSb32mJ2KzDC KMbP/a7Mpt/f1TQVznxyN59TR/0lgF+K3NBGWSDw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christian Brauner , Oleg Nesterov , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 5.2 27/59] exit: make setting exit_state consistent Date: Tue, 6 Aug 2019 17:32:47 -0400 Message-Id: <20190806213319.19203-27-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213319.19203-1-sashal@kernel.org> References: <20190806213319.19203-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christian Brauner [ Upstream commit 30b692d3b390c6fe78a5064be0c4bbd44a41be59 ] Since commit b191d6491be6 ("pidfd: fix a poll race when setting exit_state") we unconditionally set exit_state to EXIT_ZOMBIE before calling into do_notify_parent(). This was done to eliminate a race when querying exit_state in do_notify_pidfd(). Back then we decided to do the absolute minimal thing to fix this and not touch the rest of the exit_notify() function where exit_state is set. Since this fix has not caused any issues change the setting of exit_state to EXIT_DEAD in the autoreap case to account for the fact hat exit_state is set to EXIT_ZOMBIE unconditionally. This fix was planned but also explicitly requested in [1] and makes the whole code more consistent. /* References */ [1]: https://lore.kernel.org/lkml/CAHk-=wigcxGFR2szue4wavJtH5cYTTeNES=toUBVGsmX0rzX+g@mail.gmail.com Signed-off-by: Christian Brauner Acked-by: Oleg Nesterov Cc: Linus Torvalds Signed-off-by: Sasha Levin --- kernel/exit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index a75b6a7f458a7..0922e84ba6c1f 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -733,9 +733,10 @@ static void exit_notify(struct task_struct *tsk, int group_dead) autoreap = true; } - tsk->exit_state = autoreap ? EXIT_DEAD : EXIT_ZOMBIE; - if (tsk->exit_state == EXIT_DEAD) + if (autoreap) { + tsk->exit_state = EXIT_DEAD; list_add(&tsk->ptrace_entry, &dead); + } /* mt-exec, de_thread() is waiting for group leader */ if (unlikely(tsk->signal->notify_count < 0)) -- 2.20.1