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

Apply changes from r234103 to ext2fs:

Browse Source 
Return EPERM from ext2_setattr() when an user without PRIV_VFS_SYSFLAGS
privilege attempts to toggle SF_SETTABLE flags.

Flags are now stored to ip->i_flags in one place after all checks.

Also, remove SF_NOUNLINK from the checks because ext2fs doesn't support
that flag.

Reviewed by:	bde
This commit is contained in:
jh 2012-04-13 05:48:31 +00:00
parent 42aaadf5ee
commit 2c87a056cc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/fs/ext2fs/ext2_vnops.c
View File

@ -424,21 +424,17 @@ ext2_setattr(ap)
* if securelevel > 0 and any existing system flags are set.
*/
if (!priv_check_cred(cred, PRIV_VFS_SYSFLAGS, 0)) {
if (ip->i_flags &
(SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) {
if (ip->i_flags & (SF_IMMUTABLE | SF_APPEND)) {
error = securelevel_gt(cred, 0);
if (error)
return (error);
}
ip->i_flags = vap->va_flags;
} else {
if (ip->i_flags &
(SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND) ||
(vap->va_flags & UF_SETTABLE) != vap->va_flags)
if (ip->i_flags & (SF_IMMUTABLE | SF_APPEND) ||
((vap->va_flags ^ ip->i_flags) & SF_SETTABLE))
return (EPERM);
ip->i_flags &= SF_SETTABLE;
ip->i_flags |= (vap->va_flags & UF_SETTABLE);
}
ip->i_flags = vap->va_flags;
ip->i_flag |= IN_CHANGE;
if (ip->i_flags & (IMMUTABLE | APPEND))
return (0);