From patchwork Fri Sep 11 20:30:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 7163751 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 05FD7BEEC1 for ; Fri, 11 Sep 2015 20:31:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0FF5207DA for ; Fri, 11 Sep 2015 20:31:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D58C6207C9 for ; Fri, 11 Sep 2015 20:31:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754066AbbIKUah (ORCPT ); Fri, 11 Sep 2015 16:30:37 -0400 Received: from mx141.netapp.com ([216.240.21.12]:57334 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751841AbbIKUaf (ORCPT ); Fri, 11 Sep 2015 16:30:35 -0400 X-IronPort-AV: E=Sophos;i="5.17,513,1437462000"; d="scan'208";a="68472685" Received: from vmwexchts02-prd.hq.netapp.com ([10.122.105.23]) by mx141-out.netapp.com with ESMTP; 11 Sep 2015 13:30:34 -0700 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS02-PRD.hq.netapp.com (10.122.105.23) with Microsoft SMTP Server id 15.0.1104.5; Fri, 11 Sep 2015 13:30:34 -0700 Received: from davros.com ([10.63.231.129]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id t8BKUOKf001605; Fri, 11 Sep 2015 13:30:32 -0700 (PDT) From: Anna Schumaker To: , , , , , , , , , , Subject: [PATCH v2 4/9] vfs: Copy should check len after file open mode Date: Fri, 11 Sep 2015 16:30:17 -0400 Message-ID: <1442003423-6884-5-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1442003423-6884-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1442003423-6884-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I don't think it makes sense to report that a copy succeeded if the files aren't open properly. Signed-off-by: Anna Schumaker Reviewed-by: David Sterba --- fs/read_write.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 82c4933..38cc251 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1345,9 +1345,6 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, if (flags) return -EINVAL; - if (len == 0) - return 0; - /* copy_file_range allows full ssize_t len, ignoring MAX_RW_COUNT */ ret = rw_verify_area(READ, file_in, &pos_in, len); if (ret >= 0) @@ -1378,6 +1375,9 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, if (inode_in == inode_out) return -EINVAL; + if (len == 0) + return 0; + ret = mnt_want_write_file(file_out); if (ret) return ret;