Currently, although you can mark a file as undeletable with 'chattr'...
> touch /tmp/wibble
> ls -l /tmp/wibble
-rw-rw-r-- 1 james james 0 Nov 16 20:00 /tmp/wibble
> chattr +u /tmp/wibble # mark file as undeletable
> lsattr /tmp/wibble
-u----------- /tmp/wibble
... it's not honoured by the kernel:
> rm /tmp/wibble # yikes! this should fail!!
This patch makes ext4 aware of the undeletable attribute such that
attempting to delete a file marked as undeltable works as expected:
> chattr +u /tmp/wibble # mark file as undeletable
> lsattr /tmp/wibble
-u----------- /tmp/wibble
> rm /tmp/wibble
rm: cannot remove `/tmp/wibble': Operation not permitted
> chattr -u /tmp/wibble # remove undeletable attribute
> lsattr /tmp/wibble
------------- /tmp/wibble
> rm /tmp/wibble # works as expected this time
Tested with e2fsprogs-1.38-12 (FC5).
Signed-off-by: James Hunt <[email protected]>
---
fs/ext4/inode.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 0a60ec5..8115b64 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2571,11 +2571,13 @@ void ext4_set_inode_flags(struct inode *
{
unsigned int flags = EXT4_I(inode)->i_flags;
- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);
+ inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_UNRM);
if (flags & EXT4_SYNC_FL)
inode->i_flags |= S_SYNC;
if (flags & EXT4_APPEND_FL)
inode->i_flags |= S_APPEND;
+ if (flags & EXT4_UNRM_FL)
+ inode->i_flags |= S_UNRM;
if (flags & EXT4_IMMUTABLE_FL)
inode->i_flags |= S_IMMUTABLE;
if (flags & EXT4_NOATIME_FL)
--
1.4.1
--
JaMeS
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
