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 144C425E809; Mon, 7 Apr 2025 18:13:26 +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=1744049607; cv=none; b=HRhCTUSYLCiGe/SVBxaFH7zKen2qx4WLFlQK5Uxq9CaunFyZylriGdSykq5qT4LOYsKH4fCo5QfQ8AyZKvlZ5uHAXt6f8ehxIashBziK0L1L3sFKFjKVvUqvwV/cmiWruBli4p4mYxTKpdHhsSBTD2GbxOT0oUI8xlg7srAu5mQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744049607; c=relaxed/simple; bh=fB+lk3o+czNd59XSos0EIlASeFBORGEaOuh0ofnppZw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UhpHOKhS6ePnK9lTMtsvCfeQTbfYoGCugwBlMofr6En7sGInK7rKmSSMuQoge09yrrNIl9s9XxtQD5DBYVALs5UobsoGWPoLkVciAZzTJjqRGHka7RwsIvQMK6NMsXWlehIdUx1IP9Id64PjcO6SKu3NbOehpJC5bvDgsaaTDhw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iW+pfr4C; 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="iW+pfr4C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6352C4AF0B; Mon, 7 Apr 2025 18:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744049606; bh=fB+lk3o+czNd59XSos0EIlASeFBORGEaOuh0ofnppZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iW+pfr4C4hZefRXrZIifP8bV99Fy+MVyxpxk36ApZyzHkpaqeJ1/EAfT1NhUd1UM3 O1i6vwW95nj4A5BR0ax98iSbILiC08pSiHBUalYJdWQ1pbvQL01i+TmJF/1A93CZF+ V8P9zumQ8e3AOQrz/sRv5VVrHHorh7voNN3n+hinT1qUO3aXFqsYR/WhjWiXlmeE/s fskvlBfRHiUJp8fwfQwjiuVZkLteKu5mIZMv6LdE4AQhLBN+iN3sgTdBDUtXVRsOBK yF5XJzejK8BayD9UcBS76gSdxxDVkGItuuIYJLWURE+fdsb3b+DvbRf6JcsVVSKEly dLMPJPBbTjOGQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josh Poimboeuf , Ingo Molnar , Kees Cook , Andrew Morton , Linus Torvalds , Sasha Levin , peterz@infradead.org, pmladek@suse.com, jani.nikula@intel.com, john.ogness@linutronix.de, gregkh@linuxfoundation.org, joel.granados@kernel.org, takakura@valinux.co.jp Subject: [PATCH AUTOSEL 6.13 25/28] objtool, panic: Disable SMAP in __stack_chk_fail() Date: Mon, 7 Apr 2025 14:12:15 -0400 Message-Id: <20250407181224.3180941-25-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250407181224.3180941-1-sashal@kernel.org> References: <20250407181224.3180941-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13.10 Content-Transfer-Encoding: 8bit From: Josh Poimboeuf [ Upstream commit 72c774aa9d1e16bfd247096935e7dae194d84929 ] __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 Signed-off-by: Ingo Molnar Cc: Kees Cook Cc: Andrew Morton Cc: Linus Torvalds Link: https://lore.kernel.org/r/a3e97e0119e1b04c725a8aa05f7bc83d98e657eb.1742852847.git.jpoimboe@kernel.org Signed-off-by: Sasha Levin --- 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 fbc59b3b64d0b..ddad0578355bb 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 = 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 5b0ff4b9221d7..b84175ccd6107 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1242,12 +1242,15 @@ static const char *uaccess_safe_builtin[] = { "__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", -- 2.39.5