From patchwork Tue Sep 12 15:54:48 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: 138681 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp910248vqx; Wed, 13 Sep 2023 00:30:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0vj/rfkhxw7ZaBW4UBW/cr7G9nn821b1QsMy2rIlkRQyboEZuBvYme3BTX+fI5us+kOq5 X-Received: by 2002:a05:6a20:e125:b0:128:ffb7:dcfe with SMTP id kr37-20020a056a20e12500b00128ffb7dcfemr3371155pzb.1.1694590221972; Wed, 13 Sep 2023 00:30:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694590221; cv=none; d=google.com; s=arc-20160816; b=fHPXQIkjh8JC9el/iGuUtcoSghWkvX6syi4L+496bcGNxmZy1dJMrL+1apQ7k3ffSu 9gpJxEaBzKc/jh5k8W8zwAMCuZTwBfHOOYE15O3f1j0AbixRP+l3gszeFey30xfMFvvM v6zWP2AfGxHQjBOoAoe9Ati0EvB88PGzOuXVNaieCqV2IikVJHUo4f4BHbsLOWnXYrax ZR/fkkJ+ylMbIWmxEwxpzxymIh4b8x9KFdR0KxyUINsupnFo//4SIQMcC7FeRJYtAtKR UXXGGAUKloIrccIEO62mJwDpGVxn9v4SAFswfzrUyfJA2JTDgMwPWsGmHFYQUdSyvnXE 7gsA== 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=Ex1xOv1iyspPp+loBPPuFZI13WAVcJpuxh3Xu5/F2Aw=; fh=L56StNRzXuSzVo2KhCwSajCxRRiMkXPwmoXp7xQJOm8=; b=IyVY2GLPvIN8Ax26iJHm3pRTmgI9r5h8xozzsCWq6tejpw/zeVs+dY8JFZZczuNGfB O4qf9DBr7XJW5qyMRuJtzGIcRSxcZojImTNABiixP3MJWvTLzIGxaR1PUoX1e5FRYE4a RQYpsuzWJcNbBENDN2ECS0VsmblCkytvFyU+JSc+s7g0yz6TfG9XnIoAmcy/h0ATS55l mGTcXPqKe4rNXX4ptQbZ2ybVYoM13RLer+j4MYmsrRszJrKQ+El/nS14qYGzjv5on4IZ 6zJmKhklKLq5aVNRJ1TLfr00W3FbGFlrnDIc3dT0eCpR5RTCwRwz1mNHafUagQSOSobL sRKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MQtn72wK; dkim=neutral (no key) header.i=@linutronix.de header.b=+PriGqNI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id v63-20020a638942000000b0057754ded064si6546864pgd.555.2023.09.13.00.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 00:30:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MQtn72wK; dkim=neutral (no key) header.i=@linutronix.de header.b=+PriGqNI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id C8928804754B; Tue, 12 Sep 2023 08:55:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236495AbjILPyz (ORCPT + 37 others); Tue, 12 Sep 2023 11:54:55 -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 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 (snail.vger.email [0.0.0.0]); Tue, 12 Sep 2023 08:55:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773123263527024558 X-GMAIL-MSGID: 1776906636628226074 The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 7575e5a35267983dcbeb1e0d3a49d21ae3cf0b82 Gitweb: https://git.kernel.org/tip/7575e5a35267983dcbeb1e0d3a49d21ae3cf0b82 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) 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