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 A77E8C28CBC for ; Wed, 6 May 2020 06:22:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6CEFD20747 for ; Wed, 6 May 2020 06:22:50 +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="amHpJnA8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CEFD20747 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 1B7228E000C; Wed, 6 May 2020 02:22:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 167D78E0003; Wed, 6 May 2020 02:22:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 030728E000C; Wed, 6 May 2020 02:22:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0124.hostedemail.com [216.40.44.124]) by kanga.kvack.org (Postfix) with ESMTP id DEE3F8E0003 for ; Wed, 6 May 2020 02:22:49 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id A9077181AC9B6 for ; Wed, 6 May 2020 06:22:49 +0000 (UTC) X-FDA: 76785300858.17.horse75_18a7b46795461 X-HE-Tag: horse75_18a7b46795461 X-Filterd-Recvd-Size: 5935 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Wed, 6 May 2020 06:22:49 +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=ACKg+MJWZ9EI8wirgUhJ7AjHbDuAU0r1ZO6hPQ3i2lo=; b=amHpJnA8MrRoxSObKz84Qy+r89 O6hmDIJPrLqSSfhtDxhtrLRjmyFMts41gqqBCEiKmP2j09604mo0okFDH9Ur5OdMGK7tlnWkddk8Q pyaFA1itUIFg8PNBoUqpU198DDPYtvs/EBEQu6umqxwkt43IGAnWsCqSrlZE2xU46j/6sAO1qd0iK SwHvEa6r8QYB81H9SVQpbAoyDLejkRuv4OcvTug/PyoA4f2ELw1LGg58rBZSSXADcNogmvYiZktj0 zfA+jiq4/cPZYmCEPD0chSlvTE0mH0nKFIhkVsugsSTiliAKGVM81VV80XWIopjRwF4wyxmgUhBNN VNVJBZOA==; Received: from [2001:4bb8:191:66b6:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWDSA-0006e7-KB; Wed, 06 May 2020 06:22:47 +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 07/15] maccess: rename strncpy_from_unsafe_strict to strncpy_from_kernel_unsafe Date: Wed, 6 May 2020 08:22:15 +0200 Message-Id: <20200506062223.30032-8-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200506062223.30032-1-hch@lst.de> References: <20200506062223.30032-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 convention of always having _unsafe as a suffix, as well as match the naming of strncpy_from_user_unsafe. Signed-off-by: Christoph Hellwig --- arch/x86/mm/maccess.c | 2 +- include/linux/uaccess.h | 2 +- kernel/trace/bpf_trace.c | 2 +- mm/maccess.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/maccess.c b/arch/x86/mm/maccess.c index f5b85bdc0535c..6290e9894fb55 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 *sr= c, size_t size) return __probe_kernel_read(dst, src, size); } =20 -long strncpy_from_unsafe_strict(char *dst, const void *unsafe_addr, long= count) +long strncpy_from_kernel_unsafe(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 74db16fac2a04..221d703480b6e 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -310,7 +310,7 @@ extern long notrace probe_kernel_write(void *dst, con= st void *src, size_t size); extern long notrace probe_user_write(void __user *dst, const void *src, = size_t size); =20 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, +extern long strncpy_from_kernel_unsafe(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_user_unsafe(char *dst, const void __user *unsaf= e_addr, diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index d3989384e515d..e4e202f433903 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -240,7 +240,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 =3D compat ? strncpy_from_unsafe(dst, unsafe_ptr, size) : - strncpy_from_unsafe_strict(dst, unsafe_ptr, size); + strncpy_from_kernel_unsafe(dst, unsafe_ptr, size); if (unlikely(ret < 0)) out: memset(dst, 0, size); diff --git a/mm/maccess.c b/mm/maccess.c index 76f9d4dd51300..683b70518a896 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -159,7 +159,7 @@ long probe_user_write(void __user *dst, const void *s= rc, size_t size) * 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. * - * Same as strncpy_from_unsafe_strict() except that for architectures wi= th + * Same as strncpy_from_kernel_unsafe() except that for architectures wi= th * not fully separated user and kernel address spaces this function also= works * for user address tanges. * @@ -170,7 +170,7 @@ long __weak strncpy_from_unsafe(char *dst, const void= *unsafe_addr, long count) __attribute__((alias("__strncpy_from_unsafe"))); =20 /** - * strncpy_from_unsafe_strict: - Copy a NUL terminated string from unsaf= e + * strncpy_from_kernel_unsafe: - Copy a NUL terminated string from unsaf= e * address. * @dst: Destination address, in kernel space. This buffer must be at * least @count bytes long. @@ -187,7 +187,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 b= ytes, * sets the last byte of @dst buffer to NUL and returns @count. */ -long __weak strncpy_from_unsafe_strict(char *dst, const void *unsafe_add= r, +long __weak strncpy_from_kernel_unsafe(char *dst, const void *unsafe_add= r, long count) __attribute__((alias("__strncpy_from_unsafe"))); =20 --=20 2.26.2