From patchwork Mon Sep 2 05:31:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 13786722 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78C5DCD13CF for ; Mon, 2 Sep 2024 05:31:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D68F8D0077; Mon, 2 Sep 2024 01:31:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F2BBD8D002D; Mon, 2 Sep 2024 01:31:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA5108D0077; Mon, 2 Sep 2024 01:31:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AC8A88D002D for ; Mon, 2 Sep 2024 01:31:52 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 63E7EAB149 for ; Mon, 2 Sep 2024 05:31:52 +0000 (UTC) X-FDA: 82518676464.22.B4D2F37 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf17.hostedemail.com (Postfix) with ESMTP id 8C99B40003 for ; Mon, 2 Sep 2024 05:31:50 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=osandov-com.20230601.gappssmtp.com header.s=20230601 header.b=IHDZ4GB4; dmarc=none; spf=none (imf17.hostedemail.com: domain of osandov@osandov.com has no SPF policy when checking 209.85.210.169) smtp.mailfrom=osandov@osandov.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725255087; a=rsa-sha256; cv=none; b=u5c/wumNBRMMiprlPqeWaBdW4B5ipEXQGxjf9EdAvNkP7Bd28qU39iKbuTiqYC0CPXl/BV VNaSv+8OwAfw2FNbxK//ALSn2O53PjhnXSQzYiCZceyu4KleT8T63jFDDBKc3YrZJyWlRg oaYOmG+IX/8CuTE+64NzAeynJdiKzNw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=osandov-com.20230601.gappssmtp.com header.s=20230601 header.b=IHDZ4GB4; dmarc=none; spf=none (imf17.hostedemail.com: domain of osandov@osandov.com has no SPF policy when checking 209.85.210.169) smtp.mailfrom=osandov@osandov.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725255087; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=56VTu/qXLVL5nMG+uXbgMEcYFDCqL3Blag2bpSCjYxk=; b=IkzPJWTd29W8+pvFoDqgeDXR3evUZEDNX0uRLll2SmNaXd//72/oOUlm9p05/DhfWFmYUV U2bM1L+PXcKXZLaF3tbSOsWRNwSBIs84tENOMEMrkiCaj9hPAgx1vgxr6drsFL7V8mbgZl uwl9PRv6Nugj1bl7axeSN0D4PxdzdK0= Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-71428f16b09so170266b3a.0 for ; Sun, 01 Sep 2024 22:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20230601.gappssmtp.com; s=20230601; t=1725255109; x=1725859909; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=56VTu/qXLVL5nMG+uXbgMEcYFDCqL3Blag2bpSCjYxk=; b=IHDZ4GB4PvHtfEkJbB/Fr/R1CcndLxg6exNo6qIHdqD4+hotRPmyirKdPIacVyweu0 htXVPugTuBPgklpRrf8d/Xa5CzpjZAOWHCN9QAVviz+ZT2vpEFPl734/wA7uEpHG8Y5H GaSiVfs9MrIegppzrjdHnnqzoPAE0v27iLNSdyqR65X1MXuQxTl9Dxs4D9BYrsSWh0lL 882Mzap0d9PIO989TSqKNhtjtNNIdO+Nqq2cfGB9b69nWSZJXUVRZdZBHnzIH0vSlqoX b3P4TViwDgLHVGSwXpbvoou92j7ZfP2clQN7wUuZYrHDEwpbNTR4rHMJYVr3KNrQJwLR 6ZEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725255109; x=1725859909; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=56VTu/qXLVL5nMG+uXbgMEcYFDCqL3Blag2bpSCjYxk=; b=Ug4ijQJ+O2o8eSbapoAl0RjyWJlUdCOImMwlhspOBtiqyQSVVZK3vlLXaFWWhoWbrQ 9hAl4mDwODttckBrT6iMaYQKUsKkeWufCSVWREVMBNQwsSLIUIsq8BPxcVbSZoxcM5vu 0f8vUq/mc8Zao8qMBTfe5c8QS1AEAC7sNF9nAw1XeNuNngyNas7M7ocD0dkJI10SJRqo HncMvpohpEwANaVi6mm2xycd68A5+Tl4EQwpVLLDI4/7xO9lnTBI73KeW5Z5AoAbsWim PRhjlKpTmRao5zR7ULEjFBe7HUZS4xWZ0po5FZgwaXG8uJMEdy7iZbmOWHv+itbTGvoi sJ3A== X-Gm-Message-State: AOJu0YwHN3o0UnNq41OYJsD8XqON2mgX9P5u0F5Cj1jZID1IuBI9OZfT rcnf9jx13ajjYNBR5jITpFcrHDNFVG+SESz9Hw/+Olrz++tBE9cX7+21XD1dEPu1NeqCmPIyl+D A X-Google-Smtp-Source: AGHT+IHP9EQ25y63/ZmPp8u38IbeoRt/KYiwtSvqUDmg44wFA6t/ROSaOYVvZchoffP9nEa6l2KaPg== X-Received: by 2002:a05:6a00:1a8e:b0:714:21c2:efb5 with SMTP id d2e1a72fcca58-717305d65acmr5552903b3a.1.1725255108509; Sun, 01 Sep 2024 22:31:48 -0700 (PDT) Received: from telecaster.hsd1.wa.comcast.net ([2601:602:8980:9170::901f]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-715e55a692fsm6076279b3a.60.2024.09.01.22.31.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Sep 2024 22:31:48 -0700 (PDT) From: Omar Sandoval To: linux-mm@kvack.org, Andrew Morton Cc: Christoph Hellwig , x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-um@lists.infradead.org, kernel-team@fb.com Subject: [PATCH 1/2] mm: rename copy_from_kernel_nofault_allowed() to copy_kernel_nofault_allowed() Date: Sun, 1 Sep 2024 22:31:28 -0700 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 8C99B40003 X-Rspamd-Server: rspam01 X-Stat-Signature: qbhetqo5smgaejy7ud8zzt3369dazsjs X-HE-Tag: 1725255110-390658 X-HE-Meta: U2FsdGVkX18+ulRBn2hYRZHZGsPaUuXLtHDoswKUB+ptjrgqTV0+LaZRw/MYSRQORBY6N+KhYiwwquKKF7NoYj/sZm0ccWN61obSv+F5TKeY7n9BlaOLf2FofsfhouokoA3NJVuUPwhy1Xgz5hF+h02VY9Xm9vasYXiM0b+Pj6hZQrm6ylBMo0unnm2b7TKD2LopAczWlyQfLUNMqweJzLGVLyB6+LWscCN8CaptyXmJbiZj5J+RMxIJIyxi23A0NbradMAaGji4ZA1aCEXR30S688oOE82znngvI5jdL/pEae0bUV7LlAZhC6tOt86oN34+tnZ4lVzQibB3m9IswxyVzeqa/56q6G16oG4Km8BhNI1fw6wcN/RRGTcDD7pddcl0MyAt5M7z8mQIRZTvXWRzmqk39Lvy+W8nwqgtue8d1zohC5dm8bRcbBhnHp136f1ZvQJ4wWX4vGw2pcPL5jfjbH88vYfAxVujxYigo6FmNIcFn1l5kiJP6pyAv7nsY3XNNYnS9iTkMLSenmL2Pv6IxDetEIDHiHQgHMhm3zgzqkxoTcKSE+LF/NKiXY9jZFHPclQlDh/vExyqkcaK5UI5/zvFrgRLZCYqeiQ2xRUt7iUf5FoqFOKPtMmsVWEZDXsLzHDAh4OUWTw4h4lDHFSqf5uM+4ZLmjpu2IqQNZk9nI/TTZceKqn4mW8+/y8XWnnYR/ZOV9jEJ5FUC5jGlWyzC369q2Cs+5eWGpYYtE4jzOJKQxH7FIG9n5IWyv1IcE5/WcV/Y8CpjXRjf+KKNyO/j2oecqk/t7OexQOBn3YP8UKECnpabnCoGSd2OloYsotZdwxbBzPiW3rywhg9knJiwd9DJvjL18Hgma5tu1jTh60fGI2hosi/bohQr9710diuUywudPptczvZrtXnIdyJzd/2xbnBZ5ompJ7gRn9LIedWREsslvGfR4hcKc+0kAy6EPs7Anvkvc1eGuh v/0Qi2be HexZq++jaAh0zq+AHOwPjXbiKy+MTbgbXJ0F6Jr0h1mGTqzaequ8bpOXJmRoOJ0v86Az7cVTnXKiCy+QE/vfBE8ScPtuBDSPMjb8eLU1tJePIq87tpcVCLxuHZCs3y1b9zsTNQbkooLFQR7yKs/oqervDVzYPmrHSL0OZgYjdKwJCLJt/dOMRHQaID6PbL4mwAwno3S7Dj8OlNQiQJMvRcV46OPkmMsS8YRONmgYfQpLX9AbEpNmVPzOG0Nw7C+ytAWsE0HFW9AeZ72Vh+ec86TzAm1O36LOeJ/lAARJiDcGrNmEr0tNo0mfl3MvFbIzf1GYf+VQF7VHYPLyk6NfuSwjvdgBQjFUeRQiwFkHIi/zPxufcxHQ5llz7fi/xaNc+9i6h2qEAX5tskPZC1ls2vY6HwnJsTuFz2y3T X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Omar Sandoval All of the existing checks are applicable to both the "from" and "to" directions, and the next patch needs it for copy_to_kernel_nofault(). Signed-off-by: Omar Sandoval --- arch/arm/mm/fault.c | 2 +- arch/loongarch/mm/maccess.c | 2 +- arch/mips/mm/maccess.c | 2 +- arch/parisc/lib/memcpy.c | 2 +- arch/powerpc/mm/maccess.c | 2 +- arch/um/kernel/maccess.c | 2 +- arch/x86/mm/maccess.c | 4 ++-- include/linux/uaccess.h | 2 +- mm/maccess.c | 7 +++---- 9 files changed, 12 insertions(+), 13 deletions(-) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index ab01b51de559..3fef0a59af4f 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -27,7 +27,7 @@ #ifdef CONFIG_MMU -bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) +bool copy_kernel_nofault_allowed(const void *unsafe_src, size_t size) { unsigned long addr = (unsigned long)unsafe_src; diff --git a/arch/loongarch/mm/maccess.c b/arch/loongarch/mm/maccess.c index 58173842c6be..70012ac0a5a8 100644 --- a/arch/loongarch/mm/maccess.c +++ b/arch/loongarch/mm/maccess.c @@ -3,7 +3,7 @@ #include #include -bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) +bool copy_kernel_nofault_allowed(const void *unsafe_src, size_t size) { /* highest bit set means kernel space */ return (unsigned long)unsafe_src >> (BITS_PER_LONG - 1); diff --git a/arch/mips/mm/maccess.c b/arch/mips/mm/maccess.c index 58173842c6be..70012ac0a5a8 100644 --- a/arch/mips/mm/maccess.c +++ b/arch/mips/mm/maccess.c @@ -3,7 +3,7 @@ #include #include -bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) +bool copy_kernel_nofault_allowed(const void *unsafe_src, size_t size) { /* highest bit set means kernel space */ return (unsigned long)unsafe_src >> (BITS_PER_LONG - 1); diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c index 5fc0c852c84c..78758b9a0f49 100644 --- a/arch/parisc/lib/memcpy.c +++ b/arch/parisc/lib/memcpy.c @@ -48,7 +48,7 @@ void * memcpy(void * dst,const void *src, size_t count) EXPORT_SYMBOL(memcpy); -bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) +bool copy_kernel_nofault_allowed(const void *unsafe_src, size_t size) { if ((unsigned long)unsafe_src < PAGE_SIZE) return false; diff --git a/arch/powerpc/mm/maccess.c b/arch/powerpc/mm/maccess.c index ea821d0ffe16..e0f4c394836c 100644 --- a/arch/powerpc/mm/maccess.c +++ b/arch/powerpc/mm/maccess.c @@ -7,7 +7,7 @@ #include #include -bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) +bool copy_kernel_nofault_allowed(const void *unsafe_src, size_t size) { return is_kernel_addr((unsigned long)unsafe_src); } diff --git a/arch/um/kernel/maccess.c b/arch/um/kernel/maccess.c index 8ccd56813f68..3497148e9aa5 100644 --- a/arch/um/kernel/maccess.c +++ b/arch/um/kernel/maccess.c @@ -7,7 +7,7 @@ #include #include -bool copy_from_kernel_nofault_allowed(const void *src, size_t size) +bool copy_kernel_nofault_allowed(const void *src, size_t size) { void *psrc = (void *)rounddown((unsigned long)src, PAGE_SIZE); diff --git a/arch/x86/mm/maccess.c b/arch/x86/mm/maccess.c index 42115ac079cf..be28eda2c0b0 100644 --- a/arch/x86/mm/maccess.c +++ b/arch/x86/mm/maccess.c @@ -6,7 +6,7 @@ #include #ifdef CONFIG_X86_64 -bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) +bool copy_kernel_nofault_allowed(const void *unsafe_src, size_t size) { unsigned long vaddr = (unsigned long)unsafe_src; @@ -36,7 +36,7 @@ bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) return __is_canonical_address(vaddr, boot_cpu_data.x86_virt_bits); } #else -bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) +bool copy_kernel_nofault_allowed(const void *unsafe_src, size_t size) { return (unsigned long)unsafe_src >= TASK_SIZE_MAX; } diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index d8e4105a2f21..297a02b2bd53 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -387,7 +387,7 @@ copy_struct_from_user(void *dst, size_t ksize, const void __user *src, return 0; } -bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size); +bool copy_kernel_nofault_allowed(const void *unsafe_src, size_t size); long copy_from_kernel_nofault(void *dst, const void *src, size_t size); long notrace copy_to_kernel_nofault(void *dst, const void *src, size_t size); diff --git a/mm/maccess.c b/mm/maccess.c index 518a25667323..72e9c03ea37f 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -7,8 +7,7 @@ #include #include -bool __weak copy_from_kernel_nofault_allowed(const void *unsafe_src, - size_t size) +bool __weak copy_kernel_nofault_allowed(const void *unsafe_src, size_t size) { return true; } @@ -28,7 +27,7 @@ long copy_from_kernel_nofault(void *dst, const void *src, size_t size) if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)) align = (unsigned long)dst | (unsigned long)src; - if (!copy_from_kernel_nofault_allowed(src, size)) + if (!copy_kernel_nofault_allowed(src, size)) return -ERANGE; pagefault_disable(); @@ -83,7 +82,7 @@ long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, long count) if (unlikely(count <= 0)) return 0; - if (!copy_from_kernel_nofault_allowed(unsafe_addr, count)) + if (!copy_kernel_nofault_allowed(unsafe_addr, count)) return -ERANGE; pagefault_disable();