d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix FIONREAD on regular files. The computed result was being ignored and

Browse Source 
it was being passed down to VOP_IOCTL() where it promptly resulted in
ENOTTY due to a missing else for the past 8 years.  While here, use a
shared vnode lock while fetching the current file's size.

MFC after:	1 week
This commit is contained in:
jhb 2013-05-03 19:08:58 +00:00
parent 383aea5677
commit 3ddeecb12b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/vfs_vnops.c
View File

@ -1364,13 +1364,12 @@ vn_ioctl(fp, com, data, active_cred, td)
case VREG: case VREG:
case VDIR: case VDIR:
if (com == FIONREAD) { if (com == FIONREAD) {
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(vp, &vattr, active_cred); error = VOP_GETATTR(vp, &vattr, active_cred);
VOP_UNLOCK(vp, 0); VOP_UNLOCK(vp, 0);
if (!error) if (!error)
*(int *)data = vattr.va_size - fp->f_offset; *(int *)data = vattr.va_size - fp->f_offset;
} } else if (com == FIONBIO || com == FIOASYNC) /* XXX */
if (com == FIONBIO || com == FIOASYNC) /* XXX */
error = 0; error = 0;
else else
error = VOP_IOCTL(vp, com, data, fp->f_flag, error = VOP_IOCTL(vp, com, data, fp->f_flag,