diff options
| -rw-r--r-- | sys/ufs/ufs/ufs_readwrite.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c index 8822fd0..dcfe951 100644 --- a/sys/ufs/ufs/ufs_readwrite.c +++ b/sys/ufs/ufs/ufs_readwrite.c @@ -71,7 +71,7 @@ READ(ap) ufs_daddr_t lbn, nextlbn; off_t bytesinfile; long size, xfersize, blkoffset; - int error, isize; + int error; u_short mode; int seqcount; int ioflag; @@ -88,23 +88,16 @@ READ(ap) if (uio->uio_rw != UIO_READ) panic("%s: mode", READ_S); - if (vp->v_type != VREG && vp->v_type != VDIR && vp->v_type != VLNK) + if (vp->v_type == VLNK) { + if ((int)ip->i_size < vp->v_mount->mnt_maxsymlinklen) + panic("%s: short symlink", READ_S); + } else if (vp->v_type != VREG && vp->v_type != VDIR) panic("%s: type %d", READ_S, vp->v_type); #endif fs = ip->I_FS; if ((u_int64_t)uio->uio_offset > fs->fs_maxfilesize) return (EFBIG); - /* handle a read() on a VLNK obtained via O_NOFOLLOW */ - if (vp->v_type == VLNK) { - isize = ip->i_size; - if ((isize < vp->v_mount->mnt_maxsymlinklen) || - (ip->i_din.di_blocks == 0)) { /* XXX - for old fastlink support */ - uiomove((char *)ip->i_shortlink, isize, ap->a_uio); - return (0); - } - } - object = vp->v_object; bytesinfile = ip->i_size - uio->uio_offset; @@ -289,11 +282,8 @@ WRITE(ap) vm_object_vndeallocate(object); return (EPERM); } - break; + /* FALLTHROUGH */ case VLNK: - /* bail out if this is from the user, it's too hard */ - if (uio->uio_segflg != UIO_SYSSPACE) - return (EOPNOTSUPP); break; case VDIR: if ((ioflag & IO_SYNC) == 0) |
