From nobody Mon Dec 27 00:58:48 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 324971910B90; Mon, 27 Dec 2021 00:58:49 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JMfS86Yrdz55wb; Mon, 27 Dec 2021 00:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C0E1E14CA6; Mon, 27 Dec 2021 00:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BR0wm57070031; Mon, 27 Dec 2021 00:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BR0wmUo070030; Mon, 27 Dec 2021 00:58:48 GMT (envelope-from git) Date: Mon, 27 Dec 2021 00:58:48 GMT Message-Id: <202112270058.1BR0wmUo070030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 3c3b641a610c - stable/13 - nfscl: add a filesize limit check to nfs_allocate() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c3b641a610cf57577c26850edb9a1de2c024f96 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640566728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCKZvgFsgy8Cr1qQeKcn+VhcbcUAeH6VP7uoGQAoxBM=; b=aWfaIYs4jK6cHCPhzNb4B9itpYYi9qX5hls9+ZBrq1TOFFfkKag9uliAO1wx/P9EEycfQJ UVjW1QZM90qb1Nr3cHHmERIbg7BWtpK8e/qV/o8hczJe5DWe97sUHDWr9IF0sMS1AZ+uld 8neJXTJlvSCruQXqQcY3N8pn0U5X9yjgIq6UHwN+B6IJp6BYklOFTbLRrVSkaZVc4P/Ip4 o9bE8LaQN+jQ/98mblryityaO6dWi1sA5602pbkJ+A90G+Hct5LchNo7bkunCwJMg3Gchi bnSYL/HMXMHU14VDXL5qcsNLaG0XhBYLPTJPEI3/M1SGEzPO10kOjOdjzd4teQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640566728; a=rsa-sha256; cv=none; b=FFZdmLk7fafj6WemLQRkyDIy9sbxUWlulSxdXaOgCsynVslr2t79PnPQbRriRdnzQN90vH 8jywwtnwNNUye+/oZR4LBJmstJQlNFbAFjOTsQXIr1iUN697N+YuNKTq+RK3MqQoSRjYwA ujppPY2h7jhs6EoeSUtivvGShlxyyW45yv0OFy0RTFctuMLe5K90Wb4+TTO9SO39feSctG LY7CdQXl/3QtDCU9oOJpuTNSU+ni6aQOp2auywdzRI5vTHbTEEEsyn+WnCEf7dtqrfKrio MoWgVXDJbxkKXnGUvUuh+qvn36ha9lYTn6/dR9dPrCo6bIYM5xESlh/pv4GfRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3c3b641a610cf57577c26850edb9a1de2c024f96 commit 3c3b641a610cf57577c26850edb9a1de2c024f96 Author: Rick Macklem AuthorDate: 2021-12-13 23:32:19 +0000 Commit: Rick Macklem CommitDate: 2021-12-27 00:55:09 +0000 nfscl: add a filesize limit check to nfs_allocate() As reported in PR#260343, nfs_allocate() did not check the filesize rlimit. This patch adds that check. PR: 260343 (cherry picked from commit fe04c91184e9e82609a657c4e6e70e213ed3a859) --- sys/fs/nfsclient/nfs_clvnops.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index fefec912cfae..38b637c5c062 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3733,6 +3733,7 @@ nfs_allocate(struct vop_allocate_args *ap) off_t alen; int attrflag, error, ret; struct timespec ts; + struct uio io; attrflag = 0; nmp = VFSTONFS(vp->v_mount); @@ -3741,18 +3742,24 @@ nfs_allocate(struct vop_allocate_args *ap) if (NFSHASNFSV4(nmp) && nmp->nm_minorvers >= NFSV42_MINORVERSION && (nmp->nm_privflag & NFSMNTP_NOALLOCATE) == 0) { mtx_unlock(&nmp->nm_mtx); + alen = *ap->a_len; + if ((uint64_t)alen > nfs_maxalloclen) + alen = nfs_maxalloclen; + + /* Check the file size limit. */ + io.uio_offset = *ap->a_offset; + io.uio_resid = alen; + error = vn_rlimit_fsize(vp, &io, td); + /* * Flush first to ensure that the allocate adds to the * file's allocation on the server. */ - error = ncl_flush(vp, MNT_WAIT, td, 1, 0); - if (error == 0) { - alen = *ap->a_len; - if ((uint64_t)alen > nfs_maxalloclen) - alen = nfs_maxalloclen; + if (error == 0) + error = ncl_flush(vp, MNT_WAIT, td, 1, 0); + if (error == 0) error = nfsrpc_allocate(vp, *ap->a_offset, alen, &nfsva, &attrflag, ap->a_cred, td, NULL); - } if (error == 0) { *ap->a_offset += alen; *ap->a_len -= alen;