From mboxrd@z Thu Jan 1 00:00:00 1970 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 B0570C77B75 for ; Mon, 22 May 2023 20:35:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 459CF900003; Mon, 22 May 2023 16:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E32D900002; Mon, 22 May 2023 16:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2AAF5900003; Mon, 22 May 2023 16:35:30 -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 19D71900002 for ; Mon, 22 May 2023 16:35:30 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DA7721404E6 for ; Mon, 22 May 2023 20:35:29 +0000 (UTC) X-FDA: 80819046378.20.F3B34FF Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id 36FA640013 for ; Mon, 22 May 2023 20:35:28 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=j5yYDFtB; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684787728; a=rsa-sha256; cv=none; b=vlae146GzCZPJbbIrXyrk/jIs86+VwlyH2jCcMUZU5rJTl1W4Dp0v5pqAIWngGnqD6pGM/ Cks6l4c5kjUEHFcN5aRVqh9I3fhZNsXalOZUbcNmvHefC2N26sDRhK48vL+IiyYkvAn+54 HZ9kI1WmZJbOBGgZRSt6S0mOH90OCGg= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=j5yYDFtB; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf01.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684787728; 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=y+WEiS/NaGbddUZi3DC0dtY5HR0w5wQG1GV0l0cLILw=; b=5fdpEL0boKe2oDpeCjao0nUAicMjMEKztQbdYcG3l/4oKZcAC+n7HqvqnomFrhEOTclkz/ 3AcScWzPSHIDhH6nKkeG+i1Kc7OMnH6AUGWjFNYJFDJH7KKzoh5cLmiNCEE/8BrHOsO/cT QzMDAARZ6Cq69zlhqx9taHXGWVN4u54= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7208262BEE; Mon, 22 May 2023 20:35:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFB53C433D2; Mon, 22 May 2023 20:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684787727; bh=WBBOfaVUfGGoU8Hmkitpa+xWNdHXkkJPQthgTtdReZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j5yYDFtBdzXqePyI8lpdVEi04496pv3AyvnZk6ScW1UV2DQ8acR1fu0Zjimr1Fttz GZftk2wWppltBRYHQQ2jJ8mlmHIW3tCIDetovhFUMWy14LPamrHwm7F4KVb0+Z+Rhb 87DD2hTbfB1dXY23B8HvEaQME2y8JC3ubY8sc+/1NPUuopB62F22XQCvkD0QCFdgvs GFDgVkUM1/RK9m+johxQwFTnguhsEIQEKfVlQqyHvMDfSNmCQA4FdjjqD19qelJAyJ HKoyuzpm/zHjF/7cy1FHls7U91J2KKAj0s/6oWCbkfvkU0sP9r6+7je1kzk/P36gQb 7yh4kJdcOSfVw== From: Jiri Olsa To: stable@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , "H. Peter Anvin" , Ingo Molnar , Masami Hiramatsu , Thomas Gleixner , linux-mm@kvack.org, bpf@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, Tsahee Zidenberg , Andrii Nakryiko , Christoph Hellwig , =?UTF-8?q?Mah=C3=A9=20Tardy?= , linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH stable 5.4 6/8] maccess: rename strncpy_from_unsafe_strict to strncpy_from_kernel_nofault Date: Mon, 22 May 2023 22:33:50 +0200 Message-Id: <20230522203352.738576-7-jolsa@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230522203352.738576-1-jolsa@kernel.org> References: <20230522203352.738576-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 36FA640013 X-Stat-Signature: nbi9cf8839hpx3nhp9hgehdbzk7zopay X-HE-Tag: 1684787728-99021 X-HE-Meta: U2FsdGVkX1/babqCbFGbVRrAMfWRo9xgaskAN9BMZHdRSKliFd9wJojeeWYJCNQ8R2w1cTh9PUwBbj2QK6ZV2TVfq3eOTH9a7DEVrzVrJOC+tSPiHaW3X4laiq54b//uZqVHSz36BMvDHbVXQH1epQT3BdyP8WMKVuW+t6y3jQ6xdQhK2K4clGHs/Gja4FuBOza6sZvoSxfDfcqN7ABQvWAn/yyoJcVClnZEDhJrX8pi9ueunno5L14yL1pT5OFSbM2QpS/6vp8WDnLTY7+8oBexyCdoKidmGvpt1VGdrpHdNcsTnT5uJ0Lj4GCQcHM6VZ0PZBvijum0Pp1X2GuEI0GHZIYm/UxjApMJRRorkCC52PbDzpJQJYc9XmJYqkE8xU4Vaoy1e4GMTWgBDUFaGpVvnDARgmDW/iOthmDne5l92MU41z1XKiaoeo0aXLMbyr26DnrHadvrmnoprX8fdjPWDqZCN7bT6pMxoJJxrPVJtcVow3q6sE2UVsR6W4aSvaUHkajnPv6MZ/8/udMXop/rqb8Wi/Dpx2bCJ9GgGQvI1D9cQPoDgxFl25flH6Iwvo9LeUASPvhxdu4SmcV2HHKTCKVaOkpdenD1GkH3irGXYJu3PiQp1De7pjCcXkien612WVjupCixvw4N/iUr9UTHmQ/mPs8lMrI5/pbrNGrzhpwus5yIon9bJfZc8Jy0mV0wGzwiGscxl+vs4tpZ37KzgZc6V5Q/u5d/0dy5a0YkZA7NB6lFszsmG/bTsRE0cu/ni/nDzfRFGRWL8PuwTLde1y+35At4pPUy7Yoiw+JENVgxsMgwRSFPN9ikS4W07gH70aXNSSX+NcaVypt6q6ehl9OHs1nWxtsmdhgQG6VyEUyzk/wdjqElhfnz3vTdqsWo3hvLVEnx90GCUEYNGf6jbJdf9p2tNx6LPV2Q/evtD2a96ccDQvX8u52rDOkhJrd0FWqJU6JiQDrdfZP DJiKIeAS Qo23AsBLdVxAb86SSJKsv569WZXQ0AyHUFw4I3a3MKhkwVAfkaMcxzyKIsxOUEusNEMq8x2bo0yS9y1adi71BDw0H9a6lzsfSRh2crRXURqHYKHSUNipZW9gF/M4ondLS1QeFaFTGIf6WUyXp1LLORuELlB679WROsLdv5XOXDvlsD/bz/4m/fhqvS2MK3+FD8hAPRt9CXKOQn+gPQub7EljbyCosOYWLS1iNSRfXwGzAtG94k0PeJv1maZoy1qv7j9zB8e8b+4FGWURqRDHaiS/G0RBXMymXy6xlB/iliv5+Fj6CxWPP9QBMdEECh1et27zBJbeBWCOCyUMwYXPwMO8dVydzm5mMfpz25OumAGl/Lw8dzj8iLPLp0JW8WrS8dHcsCVnhwL3YEJEOmt+ROW+j3YVZ+TqSdJOx0/ManGG5vBueXZzaz+q9Oew3mL6oXn748eEhhMJtBKFBXb5Y1Dns1+naxFVtosJnQsMN+5hXkHpku5tuR7GPH5QN1GyymuTSyjIkpIKiFHWSWv30pcRHO6Jjv2bV0hdak9YmxgZShtE+i/hJ6CvhVw== 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: From: Christoph Hellwig commit c4cb164426aebd635baa53685b0ebf1a127e9803 upstream. [Missing bpf_trace_printk due to not backported changes] This matches the naming of strncpy_from_user_nofault, and also makes it more clear what the function is supposed to do. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20200521152301.2587579-8-hch@lst.de Signed-off-by: Linus Torvalds --- arch/x86/mm/maccess.c | 2 +- include/linux/uaccess.h | 4 ++-- kernel/trace/bpf_trace.c | 2 +- mm/maccess.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/mm/maccess.c b/arch/x86/mm/maccess.c index f5b85bdc0535..62c4017a2473 100644 --- a/arch/x86/mm/maccess.c +++ b/arch/x86/mm/maccess.c @@ -34,7 +34,7 @@ long probe_kernel_read_strict(void *dst, const void *src, size_t size) return __probe_kernel_read(dst, src, size); } -long strncpy_from_unsafe_strict(char *dst, const void *unsafe_addr, long count) +long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, long count) { if (unlikely(invalid_probe_range((unsigned long)unsafe_addr))) return -EFAULT; diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 23bda5df4c08..7a926c5b77ce 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -355,8 +355,8 @@ extern long notrace probe_user_write(void __user *dst, const void *src, size_t s extern long notrace __probe_user_write(void __user *dst, const void *src, size_t size); extern long strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count); -extern long strncpy_from_unsafe_strict(char *dst, const void *unsafe_addr, - long count); +long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, + long count); extern long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count); long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, long count); diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 61c81c38202b..d1fd13a47bdf 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -187,7 +187,7 @@ bpf_probe_read_kernel_str_common(void *dst, u32 size, const void *unsafe_ptr, * is returned that can be used for bpf_perf_event_output() et al. */ ret = compat ? strncpy_from_unsafe(dst, unsafe_ptr, size) : - strncpy_from_unsafe_strict(dst, unsafe_ptr, size); + strncpy_from_kernel_nofault(dst, unsafe_ptr, size); if (unlikely(ret < 0)) out: memset(dst, 0, size); diff --git a/mm/maccess.c b/mm/maccess.c index 8e4d564b6c25..8cfe21dfc953 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -174,7 +174,7 @@ EXPORT_SYMBOL_GPL(probe_user_write); * If @count is smaller than the length of the string, copies @count-1 bytes, * sets the last byte of @dst buffer to NUL and returns @count. * - * Same as strncpy_from_unsafe_strict() except that for architectures with + * Same as strncpy_from_kernel_nofault() except that for architectures with * not fully separated user and kernel address spaces this function also works * for user address tanges. * @@ -186,7 +186,7 @@ long __weak strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count) __attribute__((alias("__strncpy_from_unsafe"))); /** - * strncpy_from_unsafe_strict: - Copy a NUL terminated string from unsafe + * strncpy_from_kernel_nofault: - Copy a NUL terminated string from unsafe * address. * @dst: Destination address, in kernel space. This buffer must be at * least @count bytes long. @@ -203,7 +203,7 @@ long __weak strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count) * If @count is smaller than the length of the string, copies @count-1 bytes, * sets the last byte of @dst buffer to NUL and returns @count. */ -long __weak strncpy_from_unsafe_strict(char *dst, const void *unsafe_addr, +long __weak strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, long count) __attribute__((alias("__strncpy_from_unsafe"))); -- 2.40.1