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 B093EC7EE29 for ; Mon, 22 May 2023 20:35:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CED0900003; Mon, 22 May 2023 16:35:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4588B900002; Mon, 22 May 2023 16:35:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2FACC900003; Mon, 22 May 2023 16:35:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 18F1F900002 for ; Mon, 22 May 2023 16:35:17 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D21611A04C5 for ; Mon, 22 May 2023 20:35:16 +0000 (UTC) X-FDA: 80819045832.10.C2F509E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf20.hostedemail.com (Postfix) with ESMTP id 2657B1C000B for ; Mon, 22 May 2023 20:35:14 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZIotzxhO; spf=pass (imf20.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684787715; 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=k7IDJOFoy5IHA93tYNGmeE7Bw/UW8sNq2IFcXo5S3z4=; b=v/BGHOb6ZfauvijbbeG/TYoX4CeOqc+eNYXbz/8pSsjEtVvrnZci4QhDGDfG2hDYaEZ9of NdEe+Ku268dO/uc7H5O2yaD28sbu3lWh0NxcWhuM/CUbUvTdfT3AkAm2df/LvsONLStMKF 3aS6K8sxG5lG268jaXJFNWCEWNOsrDo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684787715; a=rsa-sha256; cv=none; b=qXumfEol8egjRrjCnDpGXm04e4134gp5LdpAV0c4OTtJVX9afW77wV0u2TqySxGoOJgJup wpR1pYzH7e/MRxY1nMxpLqfzUuKCkzIS9EodsM/jsSBLbSdDM/ddwQYuk7hfF2LMHJILfy Xzw0d4GhnMzYDWB4CRxTnUJ/+WZqPTA= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZIotzxhO; spf=pass (imf20.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org; dmarc=pass (policy=none) header.from=kernel.org 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 1F56462BC8; Mon, 22 May 2023 20:35:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A771C4339B; Mon, 22 May 2023 20:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684787713; bh=eHFLwkwnqJLV1skqiSQb1kO36BXLt5pZkTr7pZXoGQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZIotzxhO3HwG38hcM6aijGpyjjnPs6cQsHkoiUDuxBLolfFQK75I5fpMs/cB2wf6V mR28ahuPQ/KT51PcT/869TcBM4E13dtkg3oN4VqdX5vLB1tTSzCswlUWwoW0mG/Nk9 unbDxoFcjbze+24r3T8thJEGfCNznl3ceEouvKiqvESC0RkGfcvdzjJdkqd17+YN8+ ewzuQBUBiMKT3knw5DWvLs+LUTtQ4INx5qw1R5jX86s12NeJgwmfyzJT7vPao72NWZ 9cyMZflIK3W6SdeIKtGaRSmhUVl67wYenrT+LW5Mw1ZSktfTIWARdzWVH3DENzNnMG TkYl06+GRoHFw== 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 5/8] maccess: rename strncpy_from_unsafe_user to strncpy_from_user_nofault Date: Mon, 22 May 2023 22:33:49 +0200 Message-Id: <20230522203352.738576-6-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-Stat-Signature: n9z3f3u758gijcij6dsnhhpn48hk3w5o X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 2657B1C000B X-Rspam-User: X-HE-Tag: 1684787714-810270 X-HE-Meta: U2FsdGVkX1+bWIrKCOCuv33150l6ONNqGi71szJwIgLwpUGSdztl2KQFzrE2iyCJhJ46AbHPzHqJQMTkPH6P2TjPdyZx35l6ODEC3KxU45xopiLuWuiBjPEKoct6wFo+yLqDGFBTjWQEisqriWzqaRy0eqr8Ys6KtbnJqxDCOWtM5rPkzCtTnAgvGdKL0MnTxKtQtsab8A5L/pvNKKTP2qXWlIk+eHtlQS+MO+IHquLpeBm325mgxQAghPDgq1csYkEo4n6W36F2hcY+L+0dNFaJprRmg50dokg0mgowDSBtqDd6VhZKXg+5IOFvXe13DV4BG++3vaVrsuIpwHyuqexqMFmVnwfUIylc4APNBGBbd4wBj31ypPJO5rsF67xSl3EsykxQUF1dCtuOqgPXbQLfVs5+PIaJxSYCzKBpGIDNzDg6w05X5+aEx2on3Wi3qcJC7+/uhKqAgfgu2HTfOBMB+f4YI9qNDNlNGji2V6Rzo4haJHShcCpAeSWCRKYgrSX5+L6LZpQ2Pc5nsHWM0YZkK615xGf8w95VZGtAo5HUwgLeElW2z1rBpyJcBVGP78LCKZqol+pgHR7GfjZ2mIQnuBiV04WVqMxPIUxfLyNvDl2NXxvYaUmd7Em1SbiOgiApPfWRNvM5knB5zw+6gg2/COHF0asXFOiSGTXe3u8fOyaQYfq58Af6NqLfrrqZw9s+jUEFgq3lYHvBHsLAgvZ/iOi6js4flYeEOFk3DB+OoSVmhW7tf379Y62ZrF3G65j5rioTr9mVoChfYyyI/FsCgGpLIngnKRnYicChY5vSAQPoT/gkvWtZvl1zMGJpHSySj5ne7Xc15oFZyxPX7Xr7ucTYEhiJJNfPkkXMk+5iKUSEwXdaPnftTw+6chGT1fLly7+zsxDuTC6RHNqGUqv5acQmx0D8YJtoNYUxyoAY0oinkL16onLO74f5PavsvwZAYRi4I5t1ip45+l3 4cb5HAnt ChfQZUvOrriRbx+KO12rHbDveGdzrHGOkAewouSc6UKHS/RguCcesW9g6JqjUFuuK2ZNyviH+6txNtkwm8nTZZxvPwI1wJGIYjbYF9IjV5jyUwJAVxvB+BNeRhrjpc9iAtJnE9S9p+DlkPq/bm580d4AWXCzFH2qDLwu/Z+y2iPg+McnDBFrUQ1Y9FLVT+ZV8B+IN2QrVUcu2AoSqdADNJeRwceT83/9rRoIoNci8rvQ0A9QI0Uf6lVVKbKPkPOIkEBBjSvMp2uxHg3piluufn+b0Ea0pYgzajiopgj6VaAuDbvQIw6JIsBumbn7MgmwcdghCqeh3Opiof9U2memTV3xgxege2UA+rjO49ppA1lTm0dWn6dS9dELyD2VB+H+o4LyIzt4LqzkToGyfQCPli92GGJDmWV7lrjlx+xiFtaX/n81oTwoKugrsuOfLVk4OkffOIowEjcmKKFzGs1EGYRvrOUg/I6Icv3Nm2FfnH/SC7T9VgCAQqLjTBsVfWx2xB/l93ADdj5Ir8VEHE+9ZFQEjxizM1HqVAVahA23P3KMrTzzsPaaPo9y27Q== 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 bd88bb5d4007949be7154deae7cef7173c751a95 upstream. [Missing bpf_trace.c hunk due to not backported changes] This matches the naming of strncpy_from_user, 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-7-hch@lst.de Signed-off-by: Linus Torvalds --- include/linux/uaccess.h | 4 ++-- kernel/trace/trace_kprobe.c | 2 +- mm/maccess.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 25ae650dcb1a..23bda5df4c08 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -358,8 +358,8 @@ 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); extern long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count); -extern long strncpy_from_unsafe_user(char *dst, const void __user *unsafe_addr, - long count); +long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, + long count); extern long strnlen_unsafe_user(const void __user *unsafe_addr, long count); /** diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index a422cf6a0358..d6ba4f6bed73 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1111,7 +1111,7 @@ fetch_store_string_user(unsigned long addr, void *dest, void *base) __dest = get_loc_data(dest, base); - ret = strncpy_from_unsafe_user(__dest, uaddr, maxlen); + ret = strncpy_from_user_nofault(__dest, uaddr, maxlen); if (ret >= 0) *(u32 *)dest = make_data_loc(ret, __dest - base); diff --git a/mm/maccess.c b/mm/maccess.c index d263c7b5e4eb..8e4d564b6c25 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -231,7 +231,7 @@ long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count) } /** - * strncpy_from_unsafe_user: - Copy a NUL terminated string from unsafe user + * strncpy_from_user_nofault: - Copy a NUL terminated string from unsafe user * address. * @dst: Destination address, in kernel space. This buffer must be at * least @count bytes long. @@ -248,7 +248,7 @@ long __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 strncpy_from_unsafe_user(char *dst, const void __user *unsafe_addr, +long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, long count) { mm_segment_t old_fs = get_fs(); -- 2.40.1