diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2018-01-27 16:34:00 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2018-01-27 16:34:00 +0000 |
| commit | 040fb18b6030ef279d6f85b1b94f497d0aa8ba42 (patch) | |
| tree | 5f67ae006da3e376314f04db55a5e4d94ebf0e48 /sys/ufs | |
| parent | ee233ab975dd38c3ee357b284f106a557018c11f (diff) | |
| download | src-040fb18b6030ef279d6f85b1b94f497d0aa8ba42.tar.gz src-040fb18b6030ef279d6f85b1b94f497d0aa8ba42.zip | |
Revert r328479:
{ext2|ufs}_readdir: Set limit on valid ncookies values.
We aren't allowed to set resid like this.
Pointed out by: kib, imp
Notes
Notes:
svn path=/head/; revision=328480
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index ec08daec213b..479091a9182d 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -2170,7 +2170,7 @@ ufs_readdir(ap) off_t offset, startoffset; size_t readcnt, skipcnt; ssize_t startresid; - int ncookies; + u_int ncookies; int error; if (uio->uio_offset < 0) @@ -2178,11 +2178,7 @@ ufs_readdir(ap) ip = VTOI(vp); if (ip->i_effnlink == 0) return (0); - if (uio->uio_resid < 0) - uio->uio_resid = 0; if (ap->a_ncookies != NULL) { - if (uio->uio_resid > MAXPHYS) - uio->uio_resid = MAXPHYS; ncookies = uio->uio_resid; if (uio->uio_offset >= ip->i_size) ncookies = 0; |