fuse2fs: fix normal (non-kernel) permissions checking
PATCH 1/2 fuse2fs: fix normal (non-kernel) permissions checking
Commit 9f69dfc4e275 ("fuse2fs: implement O_APPEND correctly") defined a new flag, A_OK, to add support for testing whether the file is valid for append operations. This is relevant for the check_iflags_access() function, but when are later testing operations mask against the inode permissions, this new flag gets in the way and causes non-root users attempting to create new inodes in a directory to fail. Fix this by masking off A_OK before doing these tests.
--- misc/fuse2fs.c | 3 +++ 1 file changed, 3 insertions(+)
misc/fuse2fs.c +3 -0
@@ -687,6 +687,9 @@ static int check_inum_access(struct fuse2fs *ff, ext2_ino_t ino, int mask)return -EACCES ; } +/* Remove the O_APPEND flag before testing permissions */ + mask &= ~A_OK ; +/* allow owner, if perms match */ if (inode_uid (inode) == ctxt->uid) {if ((mask & (perms >>6 )) == mask)
Signature · 1 line
2.47.2
PATCH 2/2 fuse2fs.1: fix formatting of newly added options in the man page
--- misc/fuse2fs.1.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
misc/fuse2fs.1.in +3 -3
@@ -54,7 +54,7 @@ do not replay the journal and mount the file system read-only \fB-o\fR fuse2fs_debug enable fuse2fs debugging .TP -.BR -o kernel +\fB-o\fR kernel Behave more like the kernel ext4 driver in the following ways: Allows processes owned by other users to access the filesystem. Uses the kernel's permissions checking logic instead of fuse2fs's.
@@ -63,10 +63,10 @@ Note that these options can still be overridden (e.g. .I nosuid ) later. .TP -.BR -o direct +\fB-o\fR direct Use O_DIRECT to access the block device. .TP -.BR -o cache_size +\fB-o\fR cache_size Set the disk cache size to this quantity. The quantity may contain the suffixes k, m, or g. By default, the size is 32MB.
Signature · 1 line
2.47.2
Re: [PATCH 2/2] fuse2fs.1: fix formatting of newly added options in the man page
Quoted 1 line · Theodore Ts'o
Signed-off-by Theodore Ts'o <[email protected]>
--D
Quoted 34 lines
--- misc/fuse2fs.1.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)misc/fuse2fs.1.in +3
-3@@ -54,7 +54,7 @@ do not replay the journal and mount the file system read-only \fB-o\fR fuse2fs_debug enable fuse2fs debugging .TP -.BR -o kernel +\fB-o\fR kernel Behave more like the kernel ext4 driver in the following ways: Allows processes owned by other users to access the filesystem. Uses the kernel's permissions checking logic instead of fuse2fs's.@@ -63,10 +63,10 @@ Note that these options can still be overridden (e.g. .I nosuid ) later. .TP -.BR -o direct +\fB-o\fR direct Use O_DIRECT to access the block device. .TP -.BR -o cache_size +\fB-o\fR cache_size Set the disk cache size to this quantity. The quantity may contain the suffixes k, m, or g. By default, the size is 32MB.Signature · 1 line
2.47.2
Quoted 10 lines · Theodore Ts'o
Commit
9f69dfc4e275("fuse2fs: implementO_APPENDcorrectly") defined a new flag,A_OK, to add support for testing whether the file is valid for append operations. This is relevant for thecheck_iflags_access()function, but when are later testing operations mask against the inode permissions, this new flag gets in the way and causes non-root users attempting to create new inodes in a directory to fail. Fix this by masking offA_OKbefore doing these tests.Fixes 9f69dfc4e275 ("fuse2fs: implement O_APPEND correctly")Signed-off-by Theodore Ts'o <[email protected]>
Looks correct to me,
--D
Quoted 22 lines
--- misc/fuse2fs.c | 3 +++ 1 file changed, 3 insertions(+)misc/fuse2fs.c +3
-0@@ -687,6 +687,9 @@ static int check_inum_access(struct fuse2fs *ff, ext2_ino_t ino, int mask)return -EACCES ; } +/* Remove the O_APPEND flag before testing permissions */ + mask &= ~A_OK ; +/* allow owner, if perms match */ if (inode_uid (inode) == ctxt->uid) {if ((mask & (perms >>6 )) == mask)Signature · 1 line
2.47.2