diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2008-07-01 15:01:29 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-26 20:53:28 -0400 |
commit | beb29e058c35ab69e96e455a12ccf7505f6de425 (patch) | |
tree | 0da9869b7e0422c34423a02216db1a758a55a95a /fs/attr.c | |
parent | b1da47e29e467f1ec36dc78d009bfb109fd533c7 (diff) | |
download | op-kernel-dev-beb29e058c35ab69e96e455a12ccf7505f6de425.zip op-kernel-dev-beb29e058c35ab69e96e455a12ccf7505f6de425.tar.gz |
[patch 4/4] vfs: immutable inode checking cleanup
Move the immutable and append-only checks from chmod, chown and utimes
into notify_change(). Checks for immutable and append-only files are
always performed by the VFS and not by the filesystem (see
permission() and may_...() in namei.c), so these belong in
notify_change(), and not in inode_change_ok().
This should be completely equivalent.
CC: Ulrich Drepper <drepper@redhat.com>
CC: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/attr.c')
-rw-r--r-- | fs/attr.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -108,6 +108,11 @@ int notify_change(struct dentry * dentry, struct iattr * attr) struct timespec now; unsigned int ia_valid = attr->ia_valid; + if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) { + if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) + return -EPERM; + } + now = current_fs_time(inode->i_sb); attr->ia_ctime = now; |