Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp3274967pxb; Mon, 18 Apr 2022 21:27:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwODHlUgX3DSJQu8s9dOFH9I/z6B8qnEhzxVFkxD0Lq8liSeSvrAKlhpKGsfkYjSEuqfOX/ X-Received: by 2002:a63:4004:0:b0:39d:8634:fff2 with SMTP id n4-20020a634004000000b0039d8634fff2mr12565400pga.28.1650342461977; Mon, 18 Apr 2022 21:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650342461; cv=none; d=google.com; s=arc-20160816; b=0FgF8XD0crzEhJeYpB5NjNCO0q6ztlsknjjgS55Vn6XkKn5QezGsg2Ftp5bvJwECKe Clx4rV3L8V5E/66qf1gR/7qca138PFVxMkg9AasBEQqtsST93LcBgPo0RGL5YwsGLwwo yVP/ufUoKMwBvESkLFRt1E7GPXJgLZkCQkv+uCnzYBXJmtETq0C5UUIOEN9nxb/m9FZB bbngzkwAuJ+M9mJON+JlWRYy73VZnLEgpu/MRwinYXv6cESgu0XuvwGxwgvRfkIReTQE flzbKx0avbGn3l1jrlsZA0HvbeM7O+XSYbJMMbyskpCdbuGxTq/YPxHfHH0YJ0C7Qbuv Nyhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+Isq+zk2J624eZUtPJ7xeNC7xKsJH08BlurzTHOz018=; b=dBX9wBnUNcwVVDqgEkMNz91KcgFW0QSAUYFdr5KH1RAjX5qyy6459uRtLzHC7Fqrg4 CDCSMC0cQTQgrXln8YU8/NJ0Ei3+Kl5WpslkNW39MXDzF913MaugJW84pPjwtHjj0VOC xCqiFa4PvzvhkbpxIon35Rnd6Fqvuih2pa3vZ4ZAEOoqLJMlsxuhxyO4FVlEFJKuV+2A /0IzPOE2PagPUTB2PNXONG/M2HwHYlb3ciihLITFQw9Hqw/GjWKwsTlvpjbM+Y/MNjQL zBB/PObuI9aVpoSkiOsk1hwwk/xeiIQZ7y6KembKwzQkFrY4QMFZTS6JHtGJl8r7DVNm OZag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dmULEkPX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m16-20020a62f210000000b004fa3a8dfffbsi9919326pfh.178.2022.04.18.21.27.23; Mon, 18 Apr 2022 21:27:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dmULEkPX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346509AbiDRQxz (ORCPT + 99 others); Mon, 18 Apr 2022 12:53:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346477AbiDRQxo (ORCPT ); Mon, 18 Apr 2022 12:53:44 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0601F32987 for ; Mon, 18 Apr 2022 09:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650300664; h=from:from: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=+Isq+zk2J624eZUtPJ7xeNC7xKsJH08BlurzTHOz018=; b=dmULEkPXkZ+44rHlwvw+WlRgVYk8tFZPVfkvSb8SWLoiPcBDjtl1lXM6P6N6a4qNdV54x0 irEuQ81UPeL3EjzXX7R526S/qd125Db8vivNvSZok0/gnYHsJRLCReMzVpchu97TcFy2lB xIz+/cGVz0GN6KzLrTs97vL23IXDle0= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-607-s_38F6OSNuet_ZOU4n_sLA-1; Mon, 18 Apr 2022 12:51:00 -0400 X-MC-Unique: s_38F6OSNuet_ZOU4n_sLA-1 Received: by mail-qv1-f70.google.com with SMTP id fw9-20020a056214238900b0043522aa5b81so12520909qvb.21 for ; Mon, 18 Apr 2022 09:51:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+Isq+zk2J624eZUtPJ7xeNC7xKsJH08BlurzTHOz018=; b=wV0zMV8BEmbaWSja5p6aPQjW/yaDYD568GkhW/1HzYVf7VK1yVHUwga3KDVFJMeB7y J4nctN4g7zqyyWRtfP11xeRCoHddtx2urFffqUo7qJxzZAOzCtv0JLPBvo0dBulnMZR9 vAPV50KQRInT96FmfAztda/p4sw93x38Zd4LgluvumKeSJmZZP5D7uvIRcZGrqYiBrny HytyAb7GY8ggt5MaeH9YQl+MjLtmyfR2PX5BQqaaiMiR1CG53UvDzxmFAxTPdHzJVAos UrzJHD8iDa2IlKt5vnmK6RNWfCQXEdbIxtpA8bS+KBSljI+OU8McMpOkXbWXPiO9AkCp L41w== X-Gm-Message-State: AOAM531qfaIaaPsQUBWaItv8Kk5l9M0o4IsJwg2g2tnGMhcMQEFMZ+cl 0v/ATPcmo7avTyOCc3NXMdeKpORZeFvG+7x9YSMFeyva+Ixsm/WUhT6YMY86sYNMHGJX+B6p8bZ HoE9pdMir50BnfBj5lVSQekSx X-Received: by 2002:a05:6214:20e5:b0:446:393a:7a92 with SMTP id 5-20020a05621420e500b00446393a7a92mr8548541qvk.28.1650300659848; Mon, 18 Apr 2022 09:50:59 -0700 (PDT) X-Received: by 2002:a05:6214:20e5:b0:446:393a:7a92 with SMTP id 5-20020a05621420e500b00446393a7a92mr8548531qvk.28.1650300659602; Mon, 18 Apr 2022 09:50:59 -0700 (PDT) Received: from treble.redhat.com ([2600:1700:6e32:6c00::35]) by smtp.gmail.com with ESMTPSA id e15-20020ac8670f000000b002e22d9c756dsm7277059qtp.30.2022.04.18.09.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 09:50:59 -0700 (PDT) From: Josh Poimboeuf To: x86@kernel.org Cc: Peter Zijlstra , linux-kernel@vger.kernel.org, Miroslav Benes Subject: [PATCH v2 05/25] x86/uaccess: Add ENDBR to __put_user_nocheck*() Date: Mon, 18 Apr 2022 09:50:24 -0700 Message-Id: <207f02177a23031091d1a608de6049a9e5e8ff80.1650300597.git.jpoimboe@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The __put_user_nocheck*() inner labels are exported, so in keeping with the "allow exported functions to be indirectly called" policy, add ENDBR. Signed-off-by: Josh Poimboeuf --- arch/x86/lib/putuser.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S index ecb2049c1273..b7dfd60243b7 100644 --- a/arch/x86/lib/putuser.S +++ b/arch/x86/lib/putuser.S @@ -48,6 +48,7 @@ SYM_FUNC_START(__put_user_1) cmp %_ASM_BX,%_ASM_CX jae .Lbad_put_user SYM_INNER_LABEL(__put_user_nocheck_1, SYM_L_GLOBAL) + ENDBR ASM_STAC 1: movb %al,(%_ASM_CX) xor %ecx,%ecx @@ -62,6 +63,7 @@ SYM_FUNC_START(__put_user_2) cmp %_ASM_BX,%_ASM_CX jae .Lbad_put_user SYM_INNER_LABEL(__put_user_nocheck_2, SYM_L_GLOBAL) + ENDBR ASM_STAC 2: movw %ax,(%_ASM_CX) xor %ecx,%ecx @@ -76,6 +78,7 @@ SYM_FUNC_START(__put_user_4) cmp %_ASM_BX,%_ASM_CX jae .Lbad_put_user SYM_INNER_LABEL(__put_user_nocheck_4, SYM_L_GLOBAL) + ENDBR ASM_STAC 3: movl %eax,(%_ASM_CX) xor %ecx,%ecx @@ -90,6 +93,7 @@ SYM_FUNC_START(__put_user_8) cmp %_ASM_BX,%_ASM_CX jae .Lbad_put_user SYM_INNER_LABEL(__put_user_nocheck_8, SYM_L_GLOBAL) + ENDBR ASM_STAC 4: mov %_ASM_AX,(%_ASM_CX) #ifdef CONFIG_X86_32 -- 2.34.1