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

Don't recurse on filedesc lock in chroot_refuse_vdir_fds().

Browse Source 
Noticed by: Michael Nottebrock <michaelnottebrock@gmx.net>
This commit is contained in:
Alfred Perlstein 2002-02-01 18:27:16 +00:00
parent 11b18c4539
commit b7184973ed
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/kern/vfs_extattr.c
View File

@ -997,15 +997,16 @@ chroot_refuse_vdir_fds(fdp)
FILEDESC_LOCK(fdp);
for (fd = 0; fd < fdp->fd_nfiles ; fd++) {
error = getvnode(fdp, fd, &fp);
if (error)
fp = fget_locked(fdp, fd);
if (fp == NULL)
continue;
vp = (struct vnode *)fp->f_data;
fdrop(fp, td);
if (vp->v_type != VDIR)
continue;
FILEDESC_UNLOCK(fdp);
return(EPERM);
if (fp->f_type == DTYPE_VNODE) {
vp = (struct vnode *)fp->f_data;
if (vp->v_type == VDIR) {
FILEDESC_UNLOCK(fdp);
return (EPERM);
}
}
}
FILEDESC_UNLOCK(fdp);
return (0);

17
sys/kern/vfs_syscalls.c
View File

@ -997,15 +997,16 @@ chroot_refuse_vdir_fds(fdp)
FILEDESC_LOCK(fdp);
for (fd = 0; fd < fdp->fd_nfiles ; fd++) {
error = getvnode(fdp, fd, &fp);
if (error)
fp = fget_locked(fdp, fd);
if (fp == NULL)
continue;
vp = (struct vnode *)fp->f_data;
fdrop(fp, td);
if (vp->v_type != VDIR)
continue;
FILEDESC_UNLOCK(fdp);
return(EPERM);
if (fp->f_type == DTYPE_VNODE) {
vp = (struct vnode *)fp->f_data;
if (vp->v_type == VDIR) {
FILEDESC_UNLOCK(fdp);
return (EPERM);
}
}
}
FILEDESC_UNLOCK(fdp);
return (0);