Received: by 2002:a05:7412:f690:b0:e2:908c:2ebd with SMTP id ej16csp953592rdb; Fri, 20 Oct 2023 04:37:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZKL2JyqcsNspgDmJtqjQkJut3bEf2etXwqf2Pi4jivauKSQE7gyEOi5GTpc6QmyGHE+Ch X-Received: by 2002:a17:90a:356:b0:27d:e29:8352 with SMTP id 22-20020a17090a035600b0027d0e298352mr1452226pjf.45.1697801871995; Fri, 20 Oct 2023 04:37:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697801871; cv=none; d=google.com; s=arc-20160816; b=GL8VgDwT0ukI7nmIBN/P79ypwtrSSi7bMUB/4Y5vqFeqobPpsuCND97AmVOb/37j0v E15RN2C/orhDySOAIXU3KRbXkrZnWB32DnRTKUPnAtSwtJ4QMadYxt+bduYuGH43NIfd UzQ8qRKbqagbzKYb7cpt8giPdihRssHZPVzx7sw/fT5mtWNxvJpL1Y3fCg0qyvyzoF5M 8BkZxPbKalMm5w5i1+1D+aCulCEKSkdrkZbku0KgTO6hXGXczlZXuGBXAElwd06NiFdX cknWiCERhUbM2G51Ak05TZtkaoXIJWBe3P/DUBHOc318oE04HcafGO79ibEWVINQEGPy mBxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=Oxp3oWmcGVFMqwfRiRPU/lknufhrrZQDAJne/2r8wOg=; fh=L3STPe2QwZ1YxqBdNh0vxZSj3kBIMfI0nfbPoK9skWs=; b=N7ybyocWvd5T9CvL1nAVBcoBtZTF5/1FOEan5skVoxVzc/mHXRla9rZihZ0FZMdzuE /u79PL03YoCi6miQAZbe+VFDz/+FaExHbYhqBqGiYTc5NnBsHzx9P34AEZBqlBbSiPbh KSQ4SOzbtGQn/z6IxnRYGmORw7oL3JrHTdihgsa0BcoeO8h/tu9UFFl/4BR4sLFuOHki 4Gun+UGBtu0rP+YuPDpIe2Lew+WDIX/OOMLu/CpSyU8686k7Gqv8sP2ilU0Z3+og5hVO mAFG1HmQEa/crI58TeieCzn28LJq4HumePOAEVrLYc/ta0XjKaQUJ2JVzITph4Y1nYFu nIcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=PvaQyMey; dkim=neutral (no key) header.i=@linutronix.de header.b=0UXrhkq6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id e8-20020a17090a77c800b0026b698fdda6si4024573pjs.98.2023.10.20.04.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 04:37:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=PvaQyMey; dkim=neutral (no key) header.i=@linutronix.de header.b=0UXrhkq6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 871838283A3F; Fri, 20 Oct 2023 04:37:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377113AbjJTLhS (ORCPT + 99 others); Fri, 20 Oct 2023 07:37:18 -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: 7bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 20 Oct 2023 04:37:45 -0700 (PDT) The following commit has been merged into the x86/bugs branch of tip: Commit-ID: b587fef124f98f3ab1322dba8e37cdff660acd8c Gitweb: https://git.kernel.org/tip/b587fef124f98f3ab1322dba8e37cdff660acd8c 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) += 64 vdso_img-$(VDSOX32-y) += x32 vdso_img-$(VDSO32-y) += 32 -obj-$(VDSO32-y) += vdso32-setup.o +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)