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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BB78C433E1 for ; Wed, 13 May 2020 16:01:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8137A205ED for ; Wed, 13 May 2020 16:01:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="K4WpZWHo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8137A205ED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D34ED80014; Wed, 13 May 2020 12:01:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE6098000B; Wed, 13 May 2020 12:01:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFEBD80014; Wed, 13 May 2020 12:01:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0019.hostedemail.com [216.40.44.19]) by kanga.kvack.org (Postfix) with ESMTP id A4D118000B for ; Wed, 13 May 2020 12:01:02 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 59F7345BC for ; Wed, 13 May 2020 16:01:02 +0000 (UTC) X-FDA: 76812159564.19.ocean96_60565ee27d837 X-HE-Tag: ocean96_60565ee27d837 X-Filterd-Recvd-Size: 5207 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Wed, 13 May 2020 16:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=jpK5Wnwnn1XaR8WZ0stQ2TzJ1+WlgqgC5rrcqmH47QY=; b=K4WpZWHofCtYUWqkSpp6xi6o0r gHVSatDzUO69Z24aVF5Tm+6Q5havC/kcTNIcgBPVp7Rrd2xNLLLGUILs08OD+FMygYsAnhQDsRZyV uLSa9vm6UbGvTcVN2Fb87SbXZx0lLC1l5VihQByGhrP14KhnhSdn0FmvorD4P43uifERY+ov9xDJn wy5A6zhibn71gFzf/+Hff/HqEQEufN93N8BUikwLQqfPjFcEiz8cXl+dgjfzX12iemuIjJs3gl/Xd tTTzWcSqPTiDZpAg3w0kEqPN1uch8xXuplIKDxc0UUhN3skX2AkGn8njqfBhglVdCuzL3ciho5IN3 Kq80GIgQ==; Received: from [2001:4bb8:180:9d3f:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jYtoW-0004m0-8w; Wed, 13 May 2020 16:00:56 +0000 From: Christoph Hellwig To: x86@kernel.org, Alexei Starovoitov , Daniel Borkmann , Masami Hiramatsu , Linus Torvalds , Andrew Morton Cc: linux-parisc@vger.kernel.org, linux-um@lists.infradead.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/18] maccess: rename strncpy_from_unsafe_user to strncpy_from_user_nofault Date: Wed, 13 May 2020 18:00:26 +0200 Message-Id: <20200513160038.2482415-7-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200513160038.2482415-1-hch@lst.de> References: <20200513160038.2482415-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable 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: 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 --- include/linux/uaccess.h | 4 ++-- kernel/trace/bpf_trace.c | 2 +- kernel/trace/trace_kprobe.c | 2 +- mm/maccess.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 5a36a298a85f8..b983cb1c1216a 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -313,8 +313,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_add= r, long count); extern long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, lo= ng count); -extern long strncpy_from_unsafe_user(char *dst, const void __user *unsaf= e_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 cou= nt); =20 /** diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index ca1796747a773..fcbc11040d956 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -159,7 +159,7 @@ static const struct bpf_func_proto bpf_probe_read_use= r_proto =3D { BPF_CALL_3(bpf_probe_read_user_str, void *, dst, u32, size, const void __user *, unsafe_ptr) { - int ret =3D strncpy_from_unsafe_user(dst, unsafe_ptr, size); + int ret =3D strncpy_from_user_nofault(dst, unsafe_ptr, size); =20 if (unlikely(ret < 0)) memset(dst, 0, size); diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 35989383ae113..d600f41fda1ca 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1268,7 +1268,7 @@ fetch_store_string_user(unsigned long addr, void *d= est, void *base) =20 __dest =3D get_loc_data(dest, base); =20 - ret =3D strncpy_from_unsafe_user(__dest, uaddr, maxlen); + ret =3D strncpy_from_user_nofault(__dest, uaddr, maxlen); if (ret >=3D 0) *(u32 *)dest =3D make_data_loc(ret, __dest - base); =20 diff --git a/mm/maccess.c b/mm/maccess.c index 65880ba2ca376..457d8f9bf714f 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -215,7 +215,7 @@ long __strncpy_from_unsafe(char *dst, const void *uns= afe_addr, long count) } =20 /** - * 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. @@ -232,7 +232,7 @@ long __strncpy_from_unsafe(char *dst, const void *uns= afe_addr, long count) * If @count is smaller than the length of the string, copies @count-1 b= ytes, * 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 =3D get_fs(); --=20 2.26.2