upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfscl: add a filesize limit check to nfs_allocate()

Browse source 
As reported in PR#260343, nfs_allocate() did not check
the filesize rlimit. This patch adds that check.

PR:	260343

(cherry picked from commit fe04c91184)
This commit is contained in:
Rick Macklem 2021-12-13 15:32:19 -08:00
parent 030acb63d9
commit 3c3b641a61
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/fs/nfsclient/nfs_clvnops.c
View file

@ -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;