Author: kib
Date: Wed Nov 12 17:31:38 2014
New Revision: 274438
URL: https://svnweb.freebsd.org/changeset/base/274438
Log:
For posix_fallocate(2) and posix_fadvise(2), return ESPIPE when
underlying file does not have DFLAG_SEEKABLE set [1].
For posix_fallocate(2), simplify error handling logic. Do return when
fp is not yet referenced.
Noted by: bde [1]
Reviewed by: jhb
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Modified:
head/sys/kern/vfs_syscalls.c
Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c Wed Nov 12 16:23:56 2014
(r274437)
+++ head/sys/kern/vfs_syscalls.c Wed Nov 12 17:31:38 2014
(r274438)
@@ -4553,38 +4553,29 @@ kern_posix_fallocate(struct thread *td,
off_t olen, ooffset;
int error;
- fp = NULL;
+ if (offset < 0 || len <= 0)
+ return (EINVAL);
+ /* Check for wrap. */
+ if (offset > OFF_MAX - len)
+ return (EFBIG);
error = fget(td, fd, cap_rights_init(&rights, CAP_WRITE), &fp);
if (error != 0)
- goto out;
-
- switch (fp->f_type) {
- case DTYPE_VNODE:
- break;
- case DTYPE_PIPE:
- case DTYPE_FIFO:
+ return (error);
+ if ((fp->f_ops->fo_flags & DFLAG_SEEKABLE) == 0) {
error = ESPIPE;
goto out;
- default:
- error = ENODEV;
- goto out;
}
if ((fp->f_flag & FWRITE) == 0) {
error = EBADF;
goto out;
}
- vp = fp->f_vnode;
- if (vp->v_type != VREG) {
+ if (fp->f_type != DTYPE_VNODE) {
error = ENODEV;
goto out;
}
- if (offset < 0 || len <= 0) {
- error = EINVAL;
- goto out;
- }
- /* Check for wrap. */
- if (offset > OFF_MAX - len) {
- error = EFBIG;
+ vp = fp->f_vnode;
+ if (vp->v_type != VREG) {
+ error = ENODEV;
goto out;
}
@@ -4621,8 +4612,7 @@ kern_posix_fallocate(struct thread *td,
maybe_yield();
}
out:
- if (fp != NULL)
- fdrop(fp, td);
+ fdrop(fp, td);
return (error);
}
@@ -4672,15 +4662,11 @@ kern_posix_fadvise(struct thread *td, in
error = fget(td, fd, cap_rights_init(&rights), &fp);
if (error != 0)
goto out;
-
- switch (fp->f_type) {
- case DTYPE_VNODE:
- break;
- case DTYPE_PIPE:
- case DTYPE_FIFO:
+ if ((fp->f_ops->fo_flags & DFLAG_SEEKABLE) == 0) {
error = ESPIPE;
goto out;
- default:
+ }
+ if (fp->f_type != DTYPE_VNODE) {
error = ENODEV;
goto out;
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
