From nobody Wed Dec 17 01:25:17 2025 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 D56721EB5F4 for ; Mon, 24 Mar 2025 21:56:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742853389; cv=none; b=Nyo8rcVejVBIDyem0r9+yeOq6haWgIOQ/Lex0qa3IoHgrAFNAlxsL6IucOuUJjATiAPvOndmyxfsLAdp8FqnkBuKq4Q24e5fYHy6M0rb723g/0hMUMUp2AxkaURC/GXNCTwPS6d60KAKjCvx/x8f7EO+61VTP3P32ZilF/hWS4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742853389; c=relaxed/simple; bh=Q0e+jxUlQcnZIxhwPBuE5JgMeJO9eNl4R7CNugxR5gw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rUGVAcSi5NKKqsQMCqot8OeUD1hoHa2Lxy12oMhyaGg9bWBUk5slXXxEC8YRc4xAxy9rF0yuavJsnbHcC4vCAtlnse0ecGMuxfRjzw5o15Smhm9VeY+sY3+X5mULz6V/FMR0rMoRgffEnW0EmNwbI8w+R9O5fFAvU2ODz9vh7Kk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qn6UzrqT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Qn6UzrqT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F108C4CEDD; Mon, 24 Mar 2025 21:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742853389; bh=Q0e+jxUlQcnZIxhwPBuE5JgMeJO9eNl4R7CNugxR5gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qn6UzrqT6xep3HeIv1eyz62P3PLrDOL9PCilW8yIqIHmKPQfYECAgQc1cFF3qoSQx NAMfQ9h04qofOjJjiVNT8fCkuPaeRP2wKJZ7nLaY6EU9A2Xt3HrrKljAFgA0sQame5 jl1ofpYxCapvRdiqOWo//06/CUA3/allCC9EL2zWKcvdOi1ilEwUXKCCI3IxSVQecM +O02Q49BL5WBBrSpyEXXHimVCjDAd+GLRhY+nyjy7HWbcToxgPrAdRHe73mANV/311 fgC6/C7TrQYsd49KbVjVhiwVxcZnzMYapGnUdGu4F3zYJbZDWi0HRKDsHQoNRKsKET pMs5llV5rfmfg== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Miroslav Benes , Brendan Jackman , Nathan Chancellor Subject: [PATCH 17/22] panic: Disable SMAP in __stack_chk_fail() Date: Mon, 24 Mar 2025 14:56:07 -0700 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" __stack_chk_fail() can be called from uaccess-enabled code. Make sure uaccess gets disabled before calling panic(). Fixes the following warning: kernel/trace/trace_branch.o: error: objtool: ftrace_likely_update+0x1ea: = call to __stack_chk_fail() with UACCESS enabled Signed-off-by: Josh Poimboeuf --- kernel/panic.c | 6 ++++++ tools/objtool/check.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/kernel/panic.c b/kernel/panic.c index d8635d5cecb2..f9f0c5148f6a 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -832,9 +832,15 @@ device_initcall(register_warn_debugfs); */ __visible noinstr void __stack_chk_fail(void) { + unsigned long flags; + instrumentation_begin(); + flags =3D user_access_save(); + panic("stack-protector: Kernel stack is corrupted in: %pB", __builtin_return_address(0)); + + user_access_restore(flags); instrumentation_end(); } EXPORT_SYMBOL(__stack_chk_fail); diff --git a/tools/objtool/check.c b/tools/objtool/check.c index f4b9fcc395eb..a953ce5fe395 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1194,12 +1194,15 @@ static const char *uaccess_safe_builtin[] =3D { "__ubsan_handle_load_invalid_value", /* STACKLEAK */ "stackleak_track_stack", + /* TRACE_BRANCH_PROFILING */ + "ftrace_likely_update", + /* STACKPROTECTOR */ + "__stack_chk_fail", /* misc */ "csum_partial_copy_generic", "copy_mc_fragile", "copy_mc_fragile_handle_tail", "copy_mc_enhanced_fast_string", - "ftrace_likely_update", /* CONFIG_TRACE_BRANCH_PROFILING */ "rep_stos_alternative", "rep_movs_alternative", "__copy_user_nocache", --=20 2.48.1