bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

afs: Fix updating of i_mode due to 3rd party change

Browse source 
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: 260a980317 ("[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>
This commit is contained in:
David Howells 2021-02-10 08:59:52 +00:00 • committed by Al Viro
parent ed94f87c2b
commit 6e1eb04a87
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fs/afs/inode.c
View file

@ -103,13 +103,13 @@ static int afs_inode_init_from_status(struct afs_operation *op,
switch (status->type) { switch (status->type) {
case AFS_FTYPE_FILE: 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_op = &afs_file_inode_operations;
inode->i_fop = &afs_file_operations; inode->i_fop = &afs_file_operations;
inode->i_mapping->a_ops = &afs_fs_aops; inode->i_mapping->a_ops = &afs_fs_aops;
break; break;
case AFS_FTYPE_DIR: 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_op = &afs_dir_inode_operations;
inode->i_fop = &afs_dir_file_operations; inode->i_fop = &afs_dir_file_operations;
inode->i_mapping->a_ops = &afs_dir_aops; 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) { if (status->mode != vnode->status.mode) {
mode = inode->i_mode; mode = inode->i_mode;
mode &= ~S_IALLUGO; mode &= ~S_IALLUGO;
mode |= status->mode; mode |= status->mode & S_IALLUGO;
WRITE_ONCE(inode->i_mode, mode); WRITE_ONCE(inode->i_mode, mode);
} }