From nobody Tue Dec 16 13:48:41 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88013CDB47E for ; Fri, 20 Oct 2023 11:37:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377142AbjJTLhT (ORCPT ); Fri, 20 Oct 2023 07:37:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377043AbjJTLhS (ORCPT ); Fri, 20 Oct 2023 07:37:18 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CBB4D49; Fri, 20 Oct 2023 04:37:16 -0700 (PDT) Date: Fri, 20 Oct 2023 11:37:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697801835; 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=Oxp3oWmcGVFMqwfRiRPU/lknufhrrZQDAJne/2r8wOg=; b=PvaQyMeyUFM/eN8VEJot3l7iNSkxxPqN/CclPPDeZScNgJI7IFLosYGHVj+usgvxM4Myth 5jSVXo6+fEvBenjgjNE37oZraD73rZKtln8QpKf3q3F9+YbmNlLeVjO06KfQBmgNhqIB9k i/GC3xI/UyGdgZ9u/oW7DAOWPlkExxOQedHGOes52i5W//7hQC96eDJKbwPMPRo83e1KTS o/2wHXD3gg0iv2toOG56oR+K5l0PTd1VyFGEt0KxvBQLuYE6NgshpQTn9BiVykDKjj491A maX8NYsJgSQZpy6lvN1KReJoyG5eYWnMVOkYNOvkoj3L8RWMj5fxhNdpMNia9Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697801835; 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=Oxp3oWmcGVFMqwfRiRPU/lknufhrrZQDAJne/2r8wOg=; b=0UXrhkq62t2zhL0b/WF43wN2gw538xjmLZS2uik952ZV7D5WgBbK3dyDJYLhUTrqdZqyq9 Z1bHZrV1JS4pahDg== From: "tip-bot2 for David Kaplan" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/bugs] x86/vdso: Run objtool on vdso32-setup.o Cc: David Kaplan , Ingo Molnar , "Borislav Petkov (AMD)" , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231010171020.462211-3-david.kaplan@amd.com> References: <20231010171020.462211-3-david.kaplan@amd.com> MIME-Version: 1.0 Message-ID: <169780183431.3135.3111084432260817314.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/bugs branch of tip: Commit-ID: b587fef124f98f3ab1322dba8e37cdff660acd8c Gitweb: https://git.kernel.org/tip/b587fef124f98f3ab1322dba8e37cdff6= 60acd8c Author: David Kaplan AuthorDate: Tue, 10 Oct 2023 12:10:19 -05:00 Committer: Borislav Petkov (AMD) CommitterDate: Fri, 20 Oct 2023 12:58:27 +02:00 x86/vdso: Run objtool on vdso32-setup.o vdso32-setup.c is part of the main kernel image and should not be excluded from objtool. Objtool is necessary in part for ensuring that returns in this file are correctly patched to the appropriate return thunk at runtime. Signed-off-by: David Kaplan Signed-off-by: Ingo Molnar Signed-off-by: Borislav Petkov (AMD) Acked-by: Borislav Petkov (AMD) Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20231010171020.462211-3-david.kaplan@amd.com --- arch/x86/entry/vdso/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 6a1821b..83c0afb 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -42,7 +42,8 @@ vdso_img-$(VDSO64-y) +=3D 64 vdso_img-$(VDSOX32-y) +=3D x32 vdso_img-$(VDSO32-y) +=3D 32 =20 -obj-$(VDSO32-y) +=3D vdso32-setup.o +obj-$(VDSO32-y) +=3D vdso32-setup.o +OBJECT_FILES_NON_STANDARD_vdso32-setup.o :=3D n =20 vobjs :=3D $(foreach F,$(vobjs-y),$(obj)/$F) vobjs32 :=3D $(foreach F,$(vobjs32-y),$(obj)/$F)