From nobody Fri Dec 19 04:58:43 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 10E64CA0EF3 for ; Tue, 12 Sep 2023 15:54:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236522AbjILPy4 (ORCPT ); Tue, 12 Sep 2023 11:54:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236443AbjILPyy (ORCPT ); Tue, 12 Sep 2023 11:54:54 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 138F010E5; Tue, 12 Sep 2023 08:54:50 -0700 (PDT) Date: Tue, 12 Sep 2023 15:54:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694534088; 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=Ex1xOv1iyspPp+loBPPuFZI13WAVcJpuxh3Xu5/F2Aw=; b=MQtn72wK3WbZNU6xby3cwGOCDzf7WQRo1o9oUT3KYsT1MEJocPDzBZvL5T02E5vaoE5KdB gRx0aG/sxgj+d0HLdUkZ4SHKIVi7jZf+nzPH9gcprbomMRz/KO4abE2TIkcaObZZAyuuZX jHXxLA4AtZsDxLAYQRMjl3QCKcDjNj6p0XQZcTvObTUsFZVENoKac0bj4xRzSXr1wRC+VN 5nCuH8cBTmymth3Jlno+VmsACbC4JWZEp7fb39ha11eEHTxY3+hmUYeedx9KvEU8/uGXX/ Ao4luflirQQ8ooBEsTgc5dau1zmO5AhNivibXi38wWm24on7/32Mu13KsP68rg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694534088; 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=Ex1xOv1iyspPp+loBPPuFZI13WAVcJpuxh3Xu5/F2Aw=; b=+PriGqNIbzCtQku0gWkMMl3MeFg5lqGbgl2O8b9IyPDKWlLKqyZyCXKmM1BTX/r+BK5Dna BUq/BfquE0xTC8Bg== 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 , Andrew Cooper , "Peter Zijlstra (Intel)" , Ingo Molnar , 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: <169453408814.27769.10306579473210020099.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/urgent branch of tip: Commit-ID: 7575e5a35267983dcbeb1e0d3a49d21ae3cf0b82 Gitweb: https://git.kernel.org/tip/7575e5a35267983dcbeb1e0d3a49d21ae= 3cf0b82 Author: Peter Zijlstra AuthorDate: Wed, 02 Aug 2023 12:55:47 +02:00 Committer: Ingo Molnar CommitterDate: Tue, 12 Sep 2023 17:51:24 +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 Reviewed-by: Andrew Cooper Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar 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) =20 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) =20 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) =20 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) =20 SYM_FUNC_START(__put_user_nocheck_8) - ENDBR ASM_STAC 9: mov %_ASM_AX,(%_ASM_CX) #ifdef CONFIG_X86_32