File flags handling fixes for ext2fs:
- Disallow setting of flags not supported by ext2fs. - Map EXT2_APPEND_FL to SF_APPEND. - Map EXT2_IMMUTABLE_FL to SF_IMMUTABLE. - Map EXT2_NODUMP_FL to UF_NODUMP. Note that ext2fs doesn't support user settable append and immutable flags. EXT2_NODUMP_FL is an user settable flag also on Linux. PR: kern/122047 Reported by: Ighighi Submitted by: Aditya Sarawgi (original version) Reviewed by: bde Approved by: trasz (mentor)
This commit is contained in:
parent
2804a96a50
commit
5639f997b7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=198940
@ -83,8 +83,9 @@ ext2_ei2i(ei, ip)
|
||||
ip->i_mtime = ei->i_mtime;
|
||||
ip->i_ctime = ei->i_ctime;
|
||||
ip->i_flags = 0;
|
||||
ip->i_flags |= (ei->i_flags & EXT2_APPEND_FL) ? APPEND : 0;
|
||||
ip->i_flags |= (ei->i_flags & EXT2_IMMUTABLE_FL) ? IMMUTABLE : 0;
|
||||
ip->i_flags |= (ei->i_flags & EXT2_APPEND_FL) ? SF_APPEND : 0;
|
||||
ip->i_flags |= (ei->i_flags & EXT2_IMMUTABLE_FL) ? SF_IMMUTABLE : 0;
|
||||
ip->i_flags |= (ei->i_flags & EXT2_NODUMP_FL) ? UF_NODUMP : 0;
|
||||
ip->i_blocks = ei->i_blocks;
|
||||
ip->i_gen = ei->i_generation;
|
||||
ip->i_uid = ei->i_uid;
|
||||
@ -121,8 +122,9 @@ ext2_i2ei(ip, ei)
|
||||
ei->i_ctime = ip->i_ctime;
|
||||
ei->i_flags = ip->i_flags;
|
||||
ei->i_flags = 0;
|
||||
ei->i_flags |= (ip->i_flags & APPEND) ? EXT2_APPEND_FL: 0;
|
||||
ei->i_flags |= (ip->i_flags & IMMUTABLE) ? EXT2_IMMUTABLE_FL: 0;
|
||||
ei->i_flags |= (ip->i_flags & SF_APPEND) ? EXT2_APPEND_FL: 0;
|
||||
ei->i_flags |= (ip->i_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE_FL: 0;
|
||||
ei->i_flags |= (ip->i_flags & UF_NODUMP) ? EXT2_NODUMP_FL : 0;
|
||||
ei->i_blocks = ip->i_blocks;
|
||||
ei->i_generation = ip->i_gen;
|
||||
ei->i_uid = ip->i_uid;
|
||||
|
@ -391,6 +391,10 @@ ext2_setattr(ap)
|
||||
return (EINVAL);
|
||||
}
|
||||
if (vap->va_flags != VNOVAL) {
|
||||
/* Disallow flags not supported by ext2fs. */
|
||||
if (vap->va_flags & ~(SF_APPEND | SF_IMMUTABLE | UF_NODUMP))
|
||||
return (EOPNOTSUPP);
|
||||
|
||||
if (vp->v_mount->mnt_flag & MNT_RDONLY)
|
||||
return (EROFS);
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user