From patchwork Tue Sep 12 11:08:31 2023 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: 138143 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp370390vqx; Tue, 12 Sep 2023 05:30:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFAWogHzbFrwnpoBhy50z7U+ShwOu3Cdt8N9/po2jEzFKyZd7cKWU29G94/fKjQUSqk3s1e X-Received: by 2002:a05:6a21:3984:b0:154:e887:f581 with SMTP id ad4-20020a056a21398400b00154e887f581mr8947880pzc.58.1694521823667; Tue, 12 Sep 2023 05:30:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694521823; cv=none; d=google.com; s=arc-20160816; b=dkfKKlpMdZ5AIVENcvL9ueKB8rC6wR1PXQYCqI4s3O2wPeyB4ikdsgm0CE46OdM1lG lTKaNXzANkNqQVimoZF08Wu5z4cLsqKc3pg5MjZJWpSE3PYDQWl4NUMJ//axokEyDZFV Z7/4bfhpiy9G51e42xVI5DWa2RHMPSDIkRTZX0y3zmvGY0wlSxCFAKX/p8HOJeIKs33t B+amC8RZ8AVz3/cT4piaOpjskP42mHrPAfEa45S2RWNY5J9YlFEATD/9+NjUZej8nRA5 t4IB7NKzkAEXsLWDLZvsrKzJ85zvU/Ib4Vx9EJ9AZ1jxxhlYVDP6mqFc+2MJHBCkQA86 ZVFQ== 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=X6z6FoePWAdjYwuSbIa2gAp7l1kBB9B/skm+SI3XrvE=; fh=xQdFc4MTDkfl621nQN3lEwvyoudKrxtP0/vIUE6HyjU=; b=B278C4vigKLliM3f3+WhgrzHyzC0Yx0MplYWlULCKf5YkRScOfpjiHnkfuz7j/qVQr imYZN/sCeF2ARa9AbOOhilX1rDq1gQ89AWlInmtfD+H5wU93RyFN9gy3LJPUI9SHdlZN Fq02VaUtLmDTgWumyJwvXgfxgdAG8lJrNYmksQuPuW3tw0f+hqOe/dYwy3G3u2Kmr2YR vPxReGVvi3rNPXwpt7zgeYdEKWS5Z7TGS0rB4y2g+C4OYsTX1oKe1RRCK9tt9u15kn3V P2djV1xWE9KCtlnvi4zH60QJ9MjN5SMmZ8YN7Gnj1JO56AuNq8hTPkMRq8u9gNEHKsee 43Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zZPteV87; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id b12-20020aa7870c000000b0068842ea36ccsi7824763pfo.56.2023.09.12.05.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 05:30:23 -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=zZPteV87; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 CD4A580BD5FD; Tue, 12 Sep 2023 04:09:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234518AbjILLJ0 (ORCPT + 37 others); Tue, 12 Sep 2023 07:09:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234486AbjILLIl (ORCPT ); Tue, 12 Sep 2023 07:08:41 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 008CE1732; Tue, 12 Sep 2023 04:08:33 -0700 (PDT) Date: Tue, 12 Sep 2023 11:08:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694516912; 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=X6z6FoePWAdjYwuSbIa2gAp7l1kBB9B/skm+SI3XrvE=; b=zZPteV87RgBufXVLfKK+GAHfxSFboemnhlT16QM/MmNjDW72NVhvEVxxKOhp8q3Uc9Os9a eOLoVZFXOf09cuPD+rytwWmBov9wkBJS8JJb8MfWtSXHQDb8bnqw04AVC+o5U3hF35NDdl g78i/u4mwmHD5eT1liRRxoO5uZig4DQuOWlgeSz7aUKzx8M2N1MC0a6J+8OWU4gwTCE2Th Jbb3MYnGViVysgT2V7Jp1ELpgRAvZNE4YqarjZJqoI6H/2mAUWF+gyxv3SMOBO3lnpjItq WheTLSohla2ep6b7ptneKIdnklb+5YvUcbU3YWcJPHS8fm7dX5sTOLLhca1Ysg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694516912; 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=X6z6FoePWAdjYwuSbIa2gAp7l1kBB9B/skm+SI3XrvE=; b=RgLxUNW8EChqVrX5fcsC9VlxPWm2qlf3Ak4XNIhHnlzvrdquFq3ZquJSZMPXwmC9KyzEmU QETXQEi6XWjOpKCw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*() Cc: David Kaplan , "Peter Zijlstra (Intel)" , Andrew Cooper , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230802110323.086971726@infradead.org> References: <20230802110323.086971726@infradead.org> MIME-Version: 1.0 Message-ID: <169451691192.27769.584862233902801314.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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]); Tue, 12 Sep 2023 04:09:41 -0700 (PDT) X-Spam-Status: No, score=-0.9 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773123263527024558 X-GMAIL-MSGID: 1776834915599998091 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 1666863f28d7c490fa62ed5d1dfb1ba31453dc98 Gitweb: https://git.kernel.org/tip/1666863f28d7c490fa62ed5d1dfb1ba31453dc98 Author: Peter Zijlstra AuthorDate: Wed, 02 Aug 2023 12:55:47 +02:00 Committer: root CommitterDate: Tue, 12 Sep 2023 12:40:28 +02:00 x86/ibt: Avoid duplicate ENDBR in __put_user_nocheck*() Commit cb855971d717 ("x86/putuser: Provide room for padding") changed __put_user_nocheck_*() into proper functions but failed to note that SYM_FUNC_START() already provides ENDBR, rendering the explicit ENDBR superfluous. Fixes: cb855971d717 ("x86/putuser: Provide room for padding") Reported-by: David Kaplan Signed-off-by: "Peter Zijlstra (Intel)" Reviewed-by: Andrew Cooper Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20230802110323.086971726@infradead.org --- arch/x86/lib/putuser.S | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S index 1451e0c..235bbda 100644 --- a/arch/x86/lib/putuser.S +++ b/arch/x86/lib/putuser.S @@ -56,7 +56,6 @@ SYM_FUNC_END(__put_user_1) EXPORT_SYMBOL(__put_user_1) SYM_FUNC_START(__put_user_nocheck_1) - ENDBR ASM_STAC 2: movb %al,(%_ASM_CX) xor %ecx,%ecx @@ -76,7 +75,6 @@ SYM_FUNC_END(__put_user_2) EXPORT_SYMBOL(__put_user_2) SYM_FUNC_START(__put_user_nocheck_2) - ENDBR ASM_STAC 4: movw %ax,(%_ASM_CX) xor %ecx,%ecx @@ -96,7 +94,6 @@ SYM_FUNC_END(__put_user_4) EXPORT_SYMBOL(__put_user_4) SYM_FUNC_START(__put_user_nocheck_4) - ENDBR ASM_STAC 6: movl %eax,(%_ASM_CX) xor %ecx,%ecx @@ -119,7 +116,6 @@ SYM_FUNC_END(__put_user_8) EXPORT_SYMBOL(__put_user_8) SYM_FUNC_START(__put_user_nocheck_8) - ENDBR ASM_STAC 9: mov %_ASM_AX,(%_ASM_CX) #ifdef CONFIG_X86_32