diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 12:57:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 12:57:01 +0200 |
| commit | 6de9c70882ecdee63a652d493bf2353963bd4c22 (patch) | |
| tree | 9d219e705492331c97f5f7dccce3b0b1a29251bf /fs/attr.c | |
| parent | d406d21d90dce2e66c7eb4a44605aac947fe55fb (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| download | kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.tar.gz kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.tar.xz kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.zip | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'fs/attr.c')
| -rw-r--r-- | fs/attr.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/attr.c b/fs/attr.c index 966b73e25f8..26c71ba1eed 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -51,7 +51,7 @@ int inode_change_ok(struct inode *inode, struct iattr *attr) } /* Check for setting the inode time. */ - if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET)) { + if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET | ATTR_TIMES_SET)) { if (!is_owner_or_cap(inode)) goto error; } @@ -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; |