From patchwork Tue Feb 20 12:31:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 203592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp363273dyc; Tue, 20 Feb 2024 04:32:20 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUXoLYXmVuRNswEYFzcztw1UY25b+uM+UJ7qejljeBGVVvGe/qPSwBNyrwFCAuRvUnB2Zm3l8QmcOmcpbIKjbdh0mcx8Q== X-Google-Smtp-Source: AGHT+IFmYB4yNkJfERhMfzi+IoF9wks/w/guyt/lyvsKzVlwFr2zKeec0dM+MHNgXxkRtOHmnJHs X-Received: by 2002:a17:906:33cb:b0:a3e:b43d:e1bd with SMTP id w11-20020a17090633cb00b00a3eb43de1bdmr3103087eja.9.1708432340776; Tue, 20 Feb 2024 04:32:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708432340; cv=pass; d=google.com; s=arc-20160816; b=my/3YkIlIoA85pH0hV7WS/OqY6+AawMNC+LeKMbYoNNG7MQ61w+mI2gYvYL6M14xV7 VBanVlUj9/LkEi+ilwi2kIhOcioddmlU1bX72t7rzSfjg6/a/cNSSi2ceYOrOgTgFMXW ba/q7YN0X/XDmVaK0GADWbCXNMnBkNCd5SUFQuCvtW/Ne/AxW7pcJl/ipsse6IwYyZwF HECzDr1mTNll0iNYxD4wt2EqTVDUiZeCEegZeo5SUq0qLfrMpkvDNzxHeQ+7/VXGdLN8 CGK9tLXVuDhNYZblpxNg5sD6cllcVFuKBCcqyqhBKKVNrtpd2XsY0/qIPpUMjnSAhhch vhyw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=ObXswrodBxrGU5oQHeC85uf/NVy2j94FFoEd8MVsz0I=; fh=b/LEBPd+xfqIs2LOR/+AejjxrYuHxHBRltYqFGAj4bE=; b=hHO+RGYf9PxTpTPLf1TJcTHy0uUdeRLhYzcK6N7tr2H6p4VmwWTt7LGppJpYTUghQg uS5+yXCwJPeS31WT/hKY4fC6rGO5KOBabeUw+QlfMo+idpzCT/JuHIQH+dgTn5M/qZ/v BzwuOfPlEG4zFyyEQ1pBI/sD/64dJZvt67nQXaf/L2TnK0GJrI3LZdN7wJ83pMoHX6mF /tDd61zrAB+SH/ATZ3vnM8eeNu9pTVHrXGfERWGJGBlxQwIKdJThcGqPy8powXDXd/UD dzIYVKqSXx0CYaXFZma28AC6Pugn2RonqU8yuHlrAlMTaxP0DwjKvPGwx/d/hEkk+WGa oZrg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=T0ml1uRi; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-73022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73022-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id ka15-20020a170907990f00b00a3f17d58f11si123930ejc.412.2024.02.20.04.32.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 04:32:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=T0ml1uRi; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-73022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73022-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 3686F1F230C1 for ; Tue, 20 Feb 2024 12:32:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B533269D0F; Tue, 20 Feb 2024 12:31:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="T0ml1uRi"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="VaxFvJMH" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 2B5BF5A7A0; Tue, 20 Feb 2024 12:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708432314; cv=none; b=FW5EgRd9fnVsegjBMfawRNg5fpr6iS8Y6FHMAiFachGBtXpG6sLelf1dy9swUOin4tuhE9ja86ZZfSKB8fvuqVuwKxHUUqnC5Qpv+h2GVnqmyVDX1vSQfrUne0Wf9wnv5AsPxYaGg5pWrjJRhTS/N0iNAyWcD+y8RnoEQwoaD7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708432314; c=relaxed/simple; bh=BqN8PgniJ71+Vcwo7x0QfMXaIGIehoo59YjYvGKY3jc=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Z5JKPwKJ5Ijxz0uUpnuj4gBm1HlicdcsXXEHHoNFs3PjuWUGstlcJ0rAlusKdIRJCcMZG9YL1DD8s2dAmLAZ27JEEETHovME1SFpS9YooHBqcaOJz0J2oaVzY2b7R1M6Rn8dARggcWngwGmzfBcwqubfeiKYLpcNwAKG8Az028w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=T0ml1uRi; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=VaxFvJMH; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Tue, 20 Feb 2024 12:31:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708432309; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ObXswrodBxrGU5oQHeC85uf/NVy2j94FFoEd8MVsz0I=; b=T0ml1uRiNfh+jWuPm/p/dDl+wTmqYCfjsH6Vf+9vZYsMFkzpCYRUaueW8jrXFHKWk6B4kz N6X8O8z2dFErYvtQcWDQ18Gt32tMxce4ZJ1jEQU7xawvX2YG61Npn3GLSGyUlnUsgTxQ8R zuuASYLHKbrhMlkgUStLEbx3hZy+0dzWq3r7VM3EAQj2KhN4DPvjnoKF2ixhrbdLLpgM1M hjYudVq5DIdFTJlAUHUmOTp4q+0Zxcvzhg5HERPHvAJQLlYVmj+VlGIwcdttFTyuSIdmSp hRK4JX0l+z7qCt/qPxTK+cy/WRoAPefSa4Rtj5ydWHLc+/rnw5s+rZSY4l4nsA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708432309; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ObXswrodBxrGU5oQHeC85uf/NVy2j94FFoEd8MVsz0I=; b=VaxFvJMHPY7KaMVFZH7MUAkx5jkkHTYrT5kLDVAY9YiTWRcFVvqWQuun+kIN1kHoOUA+w0 tiwTSjB8M33o7OCg== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/vdso: Fix rethunk patching for vdso-image-{32,64}.o Cc: Nathan Chancellor , Josh Poimboeuf , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240215032049.GA3944823@dev-arch.thelio-3990X> References: <20240215032049.GA3944823@dev-arch.thelio-3990X> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170843230884.398.17338035419021257054.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791396323041578503 X-GMAIL-MSGID: 1791421149953923397 The following commit has been merged into the x86/core branch of tip: Commit-ID: b388e57d4628eb22782bdad4cd5b83ca87a1b7c9 Gitweb: https://git.kernel.org/tip/b388e57d4628eb22782bdad4cd5b83ca87a1b7c9 Author: Josh Poimboeuf AuthorDate: Mon, 19 Feb 2024 21:57:18 -08:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 20 Feb 2024 13:26:10 +01:00 x86/vdso: Fix rethunk patching for vdso-image-{32,64}.o For CONFIG_RETHUNK kernels, objtool annotates all the function return sites so they can be patched during boot. By design, after apply_returns() is called, all tail-calls to the compiler-generated default return thunk (__x86_return_thunk) should be patched out and replaced with whatever's needed for any mitigations (or lack thereof). The commit 4461438a8405 ("x86/retpoline: Ensure default return thunk isn't used at runtime") adds a runtime check and a WARN_ONCE() if the default return thunk ever gets executed after alternatives have been applied. This warning is a sanity check to make sure objtool and apply_returns() are doing their job. As Nathan reported, that check found something: Unpatched return thunk in use. This should not happen! WARNING: CPU: 0 PID: 1 at arch/x86/kernel/cpu/bugs.c:2856 __warn_thunk+0x27/0x40 RIP: 0010:__warn_thunk+0x27/0x40 Call Trace: ? show_regs ? __warn ? __warn_thunk ? report_bug ? console_unlock ? handle_bug ? exc_invalid_op ? asm_exc_invalid_op ? ia32_binfmt_init ? __warn_thunk warn_thunk_thunk do_one_initcall kernel_init_freeable ? __pfx_kernel_init kernel_init ret_from_fork ? __pfx_kernel_init ret_from_fork_asm Boris debugged to find that the unpatched return site was in init_vdso_image_64(), and its translation unit wasn't being analyzed by objtool, so it never got annotated. So it got ignored by apply_returns(). This is only a minor issue, as this function is only called during boot. Still, objtool needs full visibility to the kernel. Fix it by enabling objtool on vdso-image-{32,64}.o. Note this problem can only be seen with !CONFIG_X86_KERNEL_IBT, as that requires objtool to run individually on all translation units rather on vmlinux.o. [ bp: Massage commit message. ] Reported-by: Nathan Chancellor Signed-off-by: Josh Poimboeuf Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20240215032049.GA3944823@dev-arch.thelio-3990X --- arch/x86/entry/vdso/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index c4df99a..b80f4bb 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -34,8 +34,12 @@ obj-y += vma.o extable.o KASAN_SANITIZE_vma.o := y UBSAN_SANITIZE_vma.o := y KCSAN_SANITIZE_vma.o := y -OBJECT_FILES_NON_STANDARD_vma.o := n -OBJECT_FILES_NON_STANDARD_extable.o := n + +OBJECT_FILES_NON_STANDARD_extable.o := n +OBJECT_FILES_NON_STANDARD_vdso-image-32.o := n +OBJECT_FILES_NON_STANDARD_vdso-image-64.o := n +OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n +OBJECT_FILES_NON_STANDARD_vma.o := n # vDSO images to build vdso_img-$(VDSO64-y) += 64 @@ -43,7 +47,6 @@ vdso_img-$(VDSOX32-y) += x32 vdso_img-$(VDSO32-y) += 32 obj-$(VDSO32-y) += vdso32-setup.o -OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) vobjs32 := $(foreach F,$(vobjs32-y),$(obj)/$F)