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

o Typo in prior version kept it from compiling (blush).

Browse Source 
Noticed by: Nobody!

o Add comment about why we restrict chflags to root for devices.
o nit noticed by bde wrt return values.
This commit is contained in:
Warner Losh 1999-08-04 04:52:18 +00:00
parent e82ef978fe
commit 711103c1cc
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/vfs_extattr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.126 1999/08/02 21:34:46 imp Exp $
* $Id: vfs_syscalls.c,v 1.127 1999/08/03 17:07:04 imp Exp $
*/
/* For 4.3 integer FS ID compatibility */
@ -1893,11 +1893,14 @@ setfflags(p, vp, flags)
struct vattr vattr;
/*
* Don't allow setting of flags on devices for non-root users.
* Prevent non-root users from setting flags on devices. When
* a device is reused, users can retain ownership of the device
* if they are allowed to set flags and programs assume that
* chown can't fail when done as root.
*/
if ((vp->va_type == VCHR || vp->va_type == VBLK) &&
(error = suser_xxx(p->ucred, p, PRISON_ROOT)))
return error;
if ((vp->v_type == VCHR || vp->v_type == VBLK) &&
((error = suser_xxx(p->p_ucred, p, PRISON_ROOT)) != 0))
return (error);
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
@ -1905,7 +1908,7 @@ setfflags(p, vp, flags)
vattr.va_flags = flags;
error = VOP_SETATTR(vp, &vattr, p->p_ucred, p);
VOP_UNLOCK(vp, 0, p);
return error;
return (error);
}
/*

15
sys/kern/vfs_syscalls.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.126 1999/08/02 21:34:46 imp Exp $
* $Id: vfs_syscalls.c,v 1.127 1999/08/03 17:07:04 imp Exp $
*/
/* For 4.3 integer FS ID compatibility */
@ -1893,11 +1893,14 @@ setfflags(p, vp, flags)
struct vattr vattr;
/*
* Don't allow setting of flags on devices for non-root users.
* Prevent non-root users from setting flags on devices. When
* a device is reused, users can retain ownership of the device
* if they are allowed to set flags and programs assume that
* chown can't fail when done as root.
*/
if ((vp->va_type == VCHR || vp->va_type == VBLK) &&
(error = suser_xxx(p->ucred, p, PRISON_ROOT)))
return error;
if ((vp->v_type == VCHR || vp->v_type == VBLK) &&
((error = suser_xxx(p->p_ucred, p, PRISON_ROOT)) != 0))
return (error);
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
@ -1905,7 +1908,7 @@ setfflags(p, vp, flags)
vattr.va_flags = flags;
error = VOP_SETATTR(vp, &vattr, p->p_ucred, p);
VOP_UNLOCK(vp, 0, p);
return error;
return (error);
}
/*