From patchwork Sat May 27 08:16:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9751671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A20D36037E for ; Sat, 27 May 2017 08:17:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92BC328455 for ; Sat, 27 May 2017 08:17:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87C7828474; Sat, 27 May 2017 08:17:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30D3F28455 for ; Sat, 27 May 2017 08:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753845AbdE0IRc (ORCPT ); Sat, 27 May 2017 04:17:32 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:49256 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753920AbdE0IRa (ORCPT ); Sat, 27 May 2017 04:17:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=o04ahHeu+atSnhUmWLVe0LuhfkiEb/aWtnExlRfPw04=; b=sn2F1XrAGsPJ+A+H/nt+kcEd8 M+1SmAd4g3XlOwamY0guW4RjHqpGjTDYZRdS2M4unLujJxY1OXNevLiTvb39xej3ypzfxQEV8Nsww 7iy3Cmoc3ZufLHW8KSwRQ7SV2I7PYDsS3KFWSUzGzwYApuduGZ2O/1lrlNTob92bG0HuyxD9VkRYZ TecWX2U0uzQvxSef/hYBbIvmb3DLKu7FQERsVQlGZIzQIyXV+rkZQYvE//WFOKSwblVTJnc6PLzYg DF2XHnvQbWByfFtMwjVTh7/raBkKzly/BJ/yN/bRdRk2TLa4yNAHZepqZB4sJNOCOCGtOO0G7EqZq FLj/B06xg==; Received: from shol69.static.otenet.gr ([83.235.170.67] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dEWuU-0001aj-Ro; Sat, 27 May 2017 08:17:19 +0000 From: Christoph Hellwig To: Alexander Viro Cc: "J. Bruce Fields" , Jeff Layton , linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 05/10] fs: move more code into do_iter_read/do_iter_write Date: Sat, 27 May 2017 11:16:49 +0300 Message-Id: <20170527081654.15957-6-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170527081654.15957-1-hch@lst.de> References: <20170527081654.15957-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The checks for the permissions and can read / write flags are common for the callers. Signed-off-by: Christoph Hellwig --- fs/read_write.c | 73 ++++++++++++++++++++++----------------------------------- 1 file changed, 28 insertions(+), 45 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index f453c9a485b9..64b61a032a56 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -922,6 +922,11 @@ static ssize_t do_iter_read(struct file *file, struct iov_iter *iter, size_t tot_len; ssize_t ret = 0; + if (!(file->f_mode & FMODE_READ)) + return -EBADF; + if (!(file->f_mode & FMODE_CAN_READ)) + return -EINVAL; + tot_len = iov_iter_count(iter); if (!tot_len) goto out; @@ -945,6 +950,11 @@ static ssize_t do_iter_write(struct file *file, struct iov_iter *iter, size_t tot_len; ssize_t ret = 0; + if (!(file->f_mode & FMODE_WRITE)) + return -EBADF; + if (!(file->f_mode & FMODE_CAN_WRITE)) + return -EINVAL; + tot_len = iov_iter_count(iter); if (!tot_len) return 0; @@ -971,17 +981,12 @@ ssize_t vfs_readv(struct file *file, const struct iovec __user *vec, struct iov_iter iter; ssize_t ret; - if (!(file->f_mode & FMODE_READ)) - return -EBADF; - if (!(file->f_mode & FMODE_CAN_READ)) - return -EINVAL; - ret = import_iovec(READ, vec, vlen, ARRAY_SIZE(iovstack), &iov, &iter); - if (ret < 0) - return ret; + if (ret >= 0) { + ret = do_iter_read(file, &iter, pos, flags); + kfree(iov); + } - ret = do_iter_read(file, &iter, pos, flags); - kfree(iov); return ret; } EXPORT_SYMBOL(vfs_readv); @@ -994,17 +999,11 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec, struct iov_iter iter; ssize_t ret; - if (!(file->f_mode & FMODE_WRITE)) - return -EBADF; - if (!(file->f_mode & FMODE_CAN_WRITE)) - return -EINVAL; - ret = import_iovec(WRITE, vec, vlen, ARRAY_SIZE(iovstack), &iov, &iter); - if (ret < 0) - return ret; - - ret = do_iter_write(file, &iter, pos, flags); - kfree(iov); + if (ret >= 0) { + ret = do_iter_write(file, &iter, pos, flags); + kfree(iov); + } return ret; } EXPORT_SYMBOL(vfs_writev); @@ -1161,21 +1160,13 @@ static size_t compat_readv(struct file *file, struct iovec iovstack[UIO_FASTIOV]; struct iovec *iov = iovstack; struct iov_iter iter; - ssize_t ret = -EBADF; - - if (!(file->f_mode & FMODE_READ)) - goto out; - - ret = -EINVAL; - if (!(file->f_mode & FMODE_CAN_READ)) - goto out; + ssize_t ret; ret = compat_import_iovec(READ, vec, vlen, UIO_FASTIOV, &iov, &iter); - if (ret < 0) - goto out; - ret = do_iter_read(file, &iter, pos, flags); - kfree(iov); -out: + if (ret >= 0) { + ret = do_iter_read(file, &iter, pos, flags); + kfree(iov); + } if (ret > 0) add_rchar(current, ret); inc_syscr(current); @@ -1274,21 +1265,13 @@ static size_t compat_writev(struct file *file, struct iovec iovstack[UIO_FASTIOV]; struct iovec *iov = iovstack; struct iov_iter iter; - ssize_t ret = -EBADF; - - if (!(file->f_mode & FMODE_WRITE)) - goto out; - - ret = -EINVAL; - if (!(file->f_mode & FMODE_CAN_WRITE)) - goto out; + ssize_t ret; ret = compat_import_iovec(WRITE, vec, vlen, UIO_FASTIOV, &iov, &iter); - if (ret < 0) - goto out; - ret = do_iter_write(file, &iter, pos, flags); - kfree(iov); -out: + if (ret >= 0) { + ret = do_iter_write(file, &iter, pos, flags); + kfree(iov); + } if (ret > 0) add_wchar(current, ret); inc_syscw(current);