diff options
| author | David Howells <dhowells@redhat.com> | 2021-02-10 08:59:52 +0000 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2021-03-08 10:19:37 -0500 |
| commit | 6e1eb04a87f954eb06a89ee6034c166351dfff6e (patch) | |
| tree | e4d12ecb8bff0dd09470d03a9cb692b32c1305ae /fs/afs/inode.c | |
| parent | ed94f87c2b123241ae5644cf82327e2da653adb6 (diff) | |
| download | linux-6e1eb04a87f954eb06a89ee6034c166351dfff6e.tar.gz linux-6e1eb04a87f954eb06a89ee6034c166351dfff6e.tar.bz2 linux-6e1eb04a87f954eb06a89ee6034c166351dfff6e.zip | |
afs: Fix updating of i_mode due to 3rd party change
Fix afs_apply_status() to mask off the irrelevant bits from status->mode
when OR'ing them into i_mode. This can happen when a 3rd party chmod
occurs.
Also fix afs_inode_init_from_status() to mask off the mode bits when
initialising i_mode.
Fixes: 260a980317da ("[AFS]: Add "directory write" support.")
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/afs/inode.c')
| -rw-r--r-- | fs/afs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/afs/inode.c b/fs/afs/inode.c index 1156b2df28d3..9f83e671c785 100644 --- a/fs/afs/inode.c +++ b/fs/afs/inode.c @@ -103,13 +103,13 @@ static int afs_inode_init_from_status(struct afs_operation *op, switch (status->type) { case AFS_FTYPE_FILE: - inode->i_mode = S_IFREG | status->mode; + inode->i_mode = S_IFREG | (status->mode & S_IALLUGO); inode->i_op = &afs_file_inode_operations; inode->i_fop = &afs_file_operations; inode->i_mapping->a_ops = &afs_fs_aops; break; case AFS_FTYPE_DIR: - inode->i_mode = S_IFDIR | status->mode; + inode->i_mode = S_IFDIR | (status->mode & S_IALLUGO); inode->i_op = &afs_dir_inode_operations; inode->i_fop = &afs_dir_file_operations; inode->i_mapping->a_ops = &afs_dir_aops; @@ -199,7 +199,7 @@ static void afs_apply_status(struct afs_operation *op, if (status->mode != vnode->status.mode) { mode = inode->i_mode; mode &= ~S_IALLUGO; - mode |= status->mode; + mode |= status->mode & S_IALLUGO; WRITE_ONCE(inode->i_mode, mode); } |