From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86BA03229 for ; Mon, 30 Jan 2023 14:25:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4BA3C433EF; Mon, 30 Jan 2023 14:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675088742; bh=iGXR7+C5GplkKLcKhMRxsxgtn9qEudSI371K+qCAJuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ox/8Xr2JpvRh+DMP0Wpoi+tFINX40vpaHq17ujs99TPKjdR5M95E9WUX1/QCylrij kZ//MODcGG6aDcB+SAqllDzaVyKV+7CIfdxalIa8f+zQGhr8Ir/KoVzdCEeMzENzqW eFQuA+FXqrnKhwjC+OcJHJL0y+njass6HrHjgYm8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tiezhu Yang , Marco Elver , Andrey Ryabinin , Baoquan He , Jonathan Corbet , Xuefeng Li , Andrew Morton , Linus Torvalds , Eric Biggers , Sasha Levin Subject: [PATCH 5.10 082/143] ubsan: no need to unset panic_on_warn in ubsan_epilogue() Date: Mon, 30 Jan 2023 14:52:19 +0100 Message-Id: <20230130134310.266824177@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130134306.862721518@linuxfoundation.org> References: <20230130134306.862721518@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Tiezhu Yang commit d83ce027a54068fabb70d2c252e1ce2da86784a4 upstream. panic_on_warn is unset inside panic(), so no need to unset it before calling panic() in ubsan_epilogue(). Link: https://lkml.kernel.org/r/1644324666-15947-5-git-send-email-yangtiezhu@loongson.cn Signed-off-by: Tiezhu Yang Reviewed-by: Marco Elver Cc: Andrey Ryabinin Cc: Baoquan He Cc: Jonathan Corbet Cc: Xuefeng Li Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Eric Biggers Signed-off-by: Sasha Levin --- lib/ubsan.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/ubsan.c b/lib/ubsan.c index adf8dcf3c84e..d81d107f64f4 100644 --- a/lib/ubsan.c +++ b/lib/ubsan.c @@ -151,16 +151,8 @@ static void ubsan_epilogue(void) current->in_ubsan--; - if (panic_on_warn) { - /* - * This thread may hit another WARN() in the panic path. - * Resetting this prevents additional WARN() from panicking the - * system on this thread. Other threads are blocked by the - * panic_mutex in panic(). - */ - panic_on_warn = 0; + if (panic_on_warn) panic("panic_on_warn set ...\n"); - } } static void handle_overflow(struct overflow_data *data, void *lhs, -- 2.39.0