From owner-svn-src-projects@freebsd.org Thu Oct 17 05:50:58 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 657E616F056 for ; Thu, 17 Oct 2019 05:50:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46tyvQ1HZHz3LFV; Thu, 17 Oct 2019 05:50:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0F97F1C052; Thu, 17 Oct 2019 05:50:58 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9H5ovql010473; Thu, 17 Oct 2019 05:50:57 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9H5ovHS010472; Thu, 17 Oct 2019 05:50:57 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201910170550.x9H5ovHS010472@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Thu, 17 Oct 2019 05:50:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r353676 - projects/nfsv42/sys/fs/nfsclient X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfsv42/sys/fs/nfsclient X-SVN-Commit-Revision: 353676 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2019 05:50:58 -0000 Author: rmacklem Date: Thu Oct 17 05:50:57 2019 New Revision: 353676 URL: https://svnweb.freebsd.org/changeset/base/353676 Log: Patch the NFSv4.2 client side Copy for the Linux server. RFC-7862 states that a Copy request with offset or offset + len greater than file size should fail with NFSERR_INVAL. However the Linux NFSv4.2 server replies with a length of 0. This patch translates this case into NFSERR_INVAL. Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c ============================================================================== --- projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Thu Oct 17 01:30:37 2019 (r353675) +++ projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Thu Oct 17 05:50:57 2019 (r353676) @@ -3542,8 +3542,9 @@ nfs_copy_file_range(struct vop_copy_file_range_args *a nmp = VFSTONFS(invp->v_mount); mtx_lock(&nmp->nm_mtx); + /* NFSv4.2 Copy is not permitted for infile == outfile. */ if (!NFSHASNFSV4(nmp) || nmp->nm_minorvers < NFSV42_MINORVERSION || - (nmp->nm_privflag & NFSMNTP_NOCOPY) != 0) { + (nmp->nm_privflag & NFSMNTP_NOCOPY) != 0 || invp == outvp) { mtx_unlock(&nmp->nm_mtx); error = vn_generic_copy_file_range(ap->a_invp, ap->a_inoffp, ap->a_outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, @@ -3633,6 +3634,15 @@ nfs_copy_file_range(struct vop_copy_file_range_args *a 1, 1); if (error == 0 && ret != 0) error = ret; + } + if (error == 0 && len2 == 0) { + /* + * Some Linux NFSv4.2 servers can reply NFS_OK, but + * with a copied length (wr_count) == 0 when the + * offset + len is past EOF. (RFC-7862 requires a + * reply of NFS4ERR_INVAL for this case.) + */ + error = NFSERR_INVAL; } if (error == 0) { if (consecutive == false) {