From patchwork Tue Sep 26 16:09:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 144963 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2030810vqu; Tue, 26 Sep 2023 09:11:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IETvags+5NUTV4KfsIYJSA/DpadtcIGnv++L96OQl5uGRjrlSELmynnfbW+Xn6/N+/44zG8 X-Received: by 2002:a05:6a20:3ba8:b0:15a:58c8:b10f with SMTP id b40-20020a056a203ba800b0015a58c8b10fmr7061988pzh.43.1695744703864; Tue, 26 Sep 2023 09:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695744703; cv=none; d=google.com; s=arc-20160816; b=mGb24qhR6yfM7JivXBgqh7TuvJMIrMJc/f65ITVBA1dmnlycxrRgo6HOA8Ltf0NjWh m+ILX+uf3QoXjLDhSpld1raK/5nAo+piYBQjFbnLaf71W0rNFf9j4/JrBaQqPWvWI0dZ b+H3MKBKwvdSxIyWahMiVcfChYuz30xIiB+qRrXEGlIn0WwRGBeLZ75qWAB2KM3yXHtT IhaFFBZDe9aX4fvfDMTtBcAEiQJNuRwmeTVb0KyCnMlBaQD73OJf51AeqYkTLcJa4GjR 805u+LdjlzAPDAaF9Sor2/mQkrmK6KM5fKoAKVh1ki1eEgYpeb22iPNacjaK1RqdSjmp 2yEQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=9D6S0oIaDp/B0mXElDPgPOtzDmcOpMfELlopXcNZ6OM=; fh=LOkoOaEb1g3NsB04fHrUg2jaPF1CTvdBPA3WWnB3Dnw=; b=HVnqPwM4Gz6vtTqrVusECP4PsH4demFxJXnkJWD7Xt8ItRyfHtiRn9XDanKX1OGpRZ lYCkW38RLf97xI15FQwlP5OyybfYD/+QgQgcip4htUUlzA9KrlBnCEZXmLJPuC96VXa6 VL/BmdS2obUmukeEV9afVMGLc6Q5b74sYrS7LgztKE4q/PBretL8L8PHH585kiZUQLzs Hiny23roQxnpuhQqGiw/HqnSd2yyJloUfBVwLlwSFfs9M+larExSgBsokB5MV5q/peEy 11jGUSrGqg6WRSfVM+nlxIF4PqnbXRBBUK/+t4IfDrF58ywHKvIXtQS4uSD9wsgKT5Bb 0SLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nGT4zamO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id cg10-20020a056a00290a00b00690f8063627si12816625pfb.38.2023.09.26.09.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 09:11:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nGT4zamO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 17822801C894; Tue, 26 Sep 2023 09:09:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235107AbjIZQJV (ORCPT + 28 others); Tue, 26 Sep 2023 12:09:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231300AbjIZQJU (ORCPT ); Tue, 26 Sep 2023 12:09:20 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FF6F95 for ; Tue, 26 Sep 2023 09:09:13 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04F55C433C7; Tue, 26 Sep 2023 16:09:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695744553; bh=KIbC1Ui2Ufy2ZZPQgUs1RBN/CWpdIljaKe9AGeuEHZU=; h=From:To:Cc:Subject:Date:From; b=nGT4zamObMbcyTm3cidGJPErWADcslA/S4HeodBErtmexNAHIo1FGdXIQbP1ZafTo dkUvTtPBLsSVezV3W4gOd73sZ9woyU0lEjWIZh0ZaLtSymgRZeQfa1mRx653HJgFKq eaDRjYsSRzOepbxCElSDxojz99v30Rz/xPk6rQhsEFeyqFNwF20T2VEZhOqF7H+eo+ RC4oNgF4oB94j3Ade3j9wHiRz2Z/XDOnE6tA4FY2WUshPSEgwUWJofrE+FFuOFp86P Xm9UPJxXmiPdScr6z9pi9FML9rp0XgDJhSNGCx9Oc8H0zNLjX+d19P3D53EZFYK9Tj 5lW5WrmgKUoiQ== From: Masahiro Yamada To: patches@armlinux.org.uk Cc: linux-kernel@vger.kernel.org, Russell King , Masahiro Yamada , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: fix get_user() broken with veneer Date: Wed, 27 Sep 2023 01:09:03 +0900 Message-Id: <20230926160903.62924-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 morse.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 (morse.vger.email [0.0.0.0]); Tue, 26 Sep 2023 09:09:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778117198732683177 X-GMAIL-MSGID: 1778117198732683177 The 32-bit ARM kernel stops working if the kernel grows to the point where veneers for __get_user_* are created. AAPCS32 [1] states, "Register r12 (IP) may be used by a linker as a scratch register between a routine and any subroutine it calls. It can also be used within a routine to hold intermediate values between subroutine calls." However, bl instructions buried within the inline asm are unpredictable for compilers; hence, "ip" must be added to the clobber list. This becomes critical when veneers for __get_user_* are created because veneers use the ip register since commit 02e541db0540 ("ARM: 8323/1: force linker to use PIC veneers"). [1]: https://github.com/ARM-software/abi-aa/blob/2023Q1/aapcs32/aapcs32.rst Signed-off-by: Masahiro Yamada Reviewed-by: Ard Biesheuvel --- KernelVersion: v6.6-rc1 arch/arm/include/asm/uaccess.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index bb5c81823117..c28f5ec21e41 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -109,16 +109,6 @@ extern int __get_user_64t_1(void *); extern int __get_user_64t_2(void *); extern int __get_user_64t_4(void *); -#define __GUP_CLOBBER_1 "lr", "cc" -#ifdef CONFIG_CPU_USE_DOMAINS -#define __GUP_CLOBBER_2 "ip", "lr", "cc" -#else -#define __GUP_CLOBBER_2 "lr", "cc" -#endif -#define __GUP_CLOBBER_4 "lr", "cc" -#define __GUP_CLOBBER_32t_8 "lr", "cc" -#define __GUP_CLOBBER_8 "lr", "cc" - #define __get_user_x(__r2, __p, __e, __l, __s) \ __asm__ __volatile__ ( \ __asmeq("%0", "r0") __asmeq("%1", "r2") \ @@ -126,7 +116,7 @@ extern int __get_user_64t_4(void *); "bl __get_user_" #__s \ : "=&r" (__e), "=r" (__r2) \ : "0" (__p), "r" (__l) \ - : __GUP_CLOBBER_##__s) + : "ip", "lr", "cc") /* narrowing a double-word get into a single 32bit word register: */ #ifdef __ARMEB__ @@ -148,7 +138,7 @@ extern int __get_user_64t_4(void *); "bl __get_user_64t_" #__s \ : "=&r" (__e), "=r" (__r2) \ : "0" (__p), "r" (__l) \ - : __GUP_CLOBBER_##__s) + : "ip", "lr", "cc") #else #define __get_user_x_64t __get_user_x #endif