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=-5.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 D7553C43465 for ; Mon, 21 Sep 2020 15:04:27 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8AEDC20758 for ; Mon, 21 Sep 2020 15:04:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GC40qOIF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8AEDC20758 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zeniv.linux.org.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OrrGXh4f4xubvTvQq/Bt8uVhmhftBSb4tx+TI+veF1E=; b=GC40qOIF7xxNVZYE1hO6x9Atn RWZPO63ciuYjpISuepXXw2YTsUJ7PolP4R/topJTiMlBjnVKQZ2dIBAUBLo6/VcTCSsAJfuWKZGDE ujwjCib7IYxKiTu4Exz6ST8kd7lCpYzh9csfwbbUNz5Xxo5XqRxvP5fevVKJObL91MSqM5lwBhtq4 7Wba5liHgkA/WT8kg8o3Y99RaxCNMQtP1eoZsOVzgBZdn1cOX16wdAnlEktnmYj7og4ffHuv09nyX lRjYrbE2WAQpS/hSN4O8qqFMBx2psMXIQBhMcqzglrjrwE0GgHIy1tWnR2Jg4hKWjWRFVgTjgJKqD s/dFoQZQA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKNKq-0003rw-AM; Mon, 21 Sep 2020 15:02:32 +0000 Received: from [2002:c35c:fd02::1] (helo=ZenIV.linux.org.uk) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKNKl-0003qK-3E for linux-arm-kernel@lists.infradead.org; Mon, 21 Sep 2020 15:02:29 +0000 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKNKV-003BjE-Jk; Mon, 21 Sep 2020 15:02:11 +0000 Date: Mon, 21 Sep 2020 16:02:11 +0100 From: Al Viro To: Christoph Hellwig Subject: Re: [PATCH 02/11] mm: call import_iovec() instead of rw_copy_check_uvector() in process_vm_rw() Message-ID: <20200921150211.GS3421308@ZenIV.linux.org.uk> References: <20200921143434.707844-1-hch@lst.de> <20200921143434.707844-3-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200921143434.707844-3-hch@lst.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200921_110227_146125_9A87E82C X-CRM114-Status: GOOD ( 25.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-aio@kvack.org, linux-mips@vger.kernel.org, David Howells , linux-mm@kvack.org, keyrings@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, Arnd Bergmann , linux-block@vger.kernel.org, io-uring@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jens Axboe , linux-parisc@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, David Laight , linux-fsdevel@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Sep 21, 2020 at 04:34:25PM +0200, Christoph Hellwig wrote: > From: David Laight > > This is the only direct call of rw_copy_check_uvector(). Removing it > will allow rw_copy_check_uvector() to be inlined into import_iovec(), > while only paying a minor price by setting up an otherwise unused > iov_iter in the process_vm_readv/process_vm_writev syscalls that aren't > in a super hot path. > @@ -443,7 +443,7 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction, > const struct iovec *iov, unsigned long nr_segs, > size_t count) > { > - WARN_ON(direction & ~(READ | WRITE)); > + WARN_ON(direction & ~(READ | WRITE | CHECK_IOVEC_ONLY)); > direction &= READ | WRITE; Ugh... > - rc = rw_copy_check_uvector(CHECK_IOVEC_ONLY, rvec, riovcnt, UIO_FASTIOV, > - iovstack_r, &iov_r); > + rc = import_iovec(CHECK_IOVEC_ONLY, rvec, riovcnt, UIO_FASTIOV, &iov_r, > + &iter_r); > if (rc <= 0) > goto free_iovecs; > > - rc = process_vm_rw_core(pid, &iter, iov_r, riovcnt, flags, vm_write); > + rc = process_vm_rw_core(pid, &iter_l, iter_r.iov, iter_r.nr_segs, > + flags, vm_write); ... and ugh^2, since now you are not only setting a meaningless iov_iter, you are creating a new place that pokes directly into struct iov_iter guts. Sure, moving rw_copy_check_uvector() over to lib/iov_iter.c makes sense. But I would rather split the access_ok()-related checks out of that thing and bury CHECK_IOVEC_ONLY. Step 1: move the damn thing to lib/iov_iter.c (same as you do, but without making it static) Step 2: split it in two: ssize_t rw_copy_check_uvector(const struct iovec __user * uvector, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer, struct iovec **ret_pointer) { unsigned long seg; ssize_t ret; struct iovec *iov = fast_pointer; *ret_pointer = fast_pointer; /* * SuS says "The readv() function *may* fail if the iovcnt argument * was less than or equal to 0, or greater than {IOV_MAX}. Linux has * traditionally returned zero for zero segments, so... */ if (nr_segs == 0) return 0; /* * First get the "struct iovec" from user memory and * verify all the pointers */ if (nr_segs > UIO_MAXIOV) return -EINVAL; if (nr_segs > fast_segs) { iov = kmalloc_array(nr_segs, sizeof(struct iovec), GFP_KERNEL); if (!iov) return -ENOMEM; *ret_pointer = iov; } if (copy_from_user(iov, uvector, nr_segs*sizeof(*uvector))) return -EFAULT; /* * According to the Single Unix Specification we should return EINVAL * if an element length is < 0 when cast to ssize_t or if the * total length would overflow the ssize_t return value of the * system call. * * Linux caps all read/write calls to MAX_RW_COUNT, and avoids the * overflow case. */ ret = 0; for (seg = 0; seg < nr_segs; seg++) { void __user *buf = iov[seg].iov_base; ssize_t len = (ssize_t)iov[seg].iov_len; /* see if we we're about to use an invalid len or if * it's about to overflow ssize_t */ if (len < 0) return -EINVAL; if (len > MAX_RW_COUNT - ret) { len = MAX_RW_COUNT - ret; iov[seg].iov_len = len; } ret += len; } return ret; } /* * This is merely an early sanity check; we do _not_ rely upon * it when we get to the actual memory accesses. */ static bool check_iovecs(const struct iovec *iov, int nr_segs) { for (seg = 0; seg < nr_segs; seg++) { void __user *buf = iov[seg].iov_base; ssize_t len = (ssize_t)iov[seg].iov_len; if (unlikely(!access_ok(buf, len))) return false; } return true; } ssize_t import_iovec(int type, const struct iovec __user * uvector, unsigned nr_segs, unsigned fast_segs, struct iovec **iov, struct iov_iter *i) { struct iovec *p; ssize_t n; n = rw_copy_check_uvector(uvector, nr_segs, fast_segs, *iov, &p); if (n > 0 && !check_iovecs(p, nr_segs)) n = -EFAULT; if (n < 0) { if (p != *iov) kfree(p); *iov = NULL; return n; } iov_iter_init(i, type, p, nr_segs, n); *iov = p == *iov ? NULL : p; return n; } kill CHECK_IOVEC_ONLY and use rw_copy_check_uvector() without the type argument in mm/process_vm_access.c Saner that way, IMO... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel