lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hfsplus: fix bug causing custom uid and gid being unable to be assigned with mount

Browse Source 
commit 9f2b5debc07073e6dfdd774e3594d0224b991927 upstream.

Despite specifying UID and GID in mount command, the specified UID and GID
were not being assigned. This patch fixes this issue.

Link: https://lkml.kernel.org/r/C0264BF5-059C-45CF-B8DA-3A3BD2C803A2@live.com
Signed-off-by: Aditya Garg <gargaditya08@live.com>
Reviewed-by: Viacheslav Dubeyko <slava@dubeyko.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aditya Garg 2022-12-07 03:05:40 +00:00 committed by Greg Kroah-Hartman
parent fe83242eab
commit cae6dddef2
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/hfsplus/hfsplus_fs.h
View File

@ -198,6 +198,8 @@ struct hfsplus_sb_info {
#define HFSPLUS_SB_HFSX 3 #define HFSPLUS_SB_HFSX 3
#define HFSPLUS_SB_CASEFOLD 4 #define HFSPLUS_SB_CASEFOLD 4
#define HFSPLUS_SB_NOBARRIER 5 #define HFSPLUS_SB_NOBARRIER 5
#define HFSPLUS_SB_UID 6
#define HFSPLUS_SB_GID 7
static inline struct hfsplus_sb_info *HFSPLUS_SB(struct super_block *sb) static inline struct hfsplus_sb_info *HFSPLUS_SB(struct super_block *sb)
{ {

4
fs/hfsplus/inode.c
View File

@ -187,11 +187,11 @@ static void hfsplus_get_perms(struct inode *inode,
mode = be16_to_cpu(perms->mode); mode = be16_to_cpu(perms->mode);
i_uid_write(inode, be32_to_cpu(perms->owner)); i_uid_write(inode, be32_to_cpu(perms->owner));
if (!i_uid_read(inode) && !mode) if ((test_bit(HFSPLUS_SB_UID, &sbi->flags)) || (!i_uid_read(inode) && !mode))
inode->i_uid = sbi->uid; inode->i_uid = sbi->uid;
i_gid_write(inode, be32_to_cpu(perms->group)); i_gid_write(inode, be32_to_cpu(perms->group));
if (!i_gid_read(inode) && !mode) if ((test_bit(HFSPLUS_SB_GID, &sbi->flags)) || (!i_gid_read(inode) && !mode))
inode->i_gid = sbi->gid; inode->i_gid = sbi->gid;
if (dir) { if (dir) {

4
fs/hfsplus/options.c
View File

@ -140,6 +140,8 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
if (!uid_valid(sbi->uid)) { if (!uid_valid(sbi->uid)) {
pr_err("invalid uid specified\n"); pr_err("invalid uid specified\n");
return 0; return 0;
} else {
set_bit(HFSPLUS_SB_UID, &sbi->flags);
} }
break; break;
case opt_gid: case opt_gid:
@ -151,6 +153,8 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
if (!gid_valid(sbi->gid)) { if (!gid_valid(sbi->gid)) {
pr_err("invalid gid specified\n"); pr_err("invalid gid specified\n");
return 0; return 0;
} else {
set_bit(HFSPLUS_SB_GID, &sbi->flags);
} }
break; break;
case opt_part: case opt_part: