diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2019-05-02 05:46:11 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-25 19:25:36 +0300 |
commit | 7e26a3ff695d2ebf8836f682ab1b5b284ad7868d (patch) | |
tree | 04ab2fcb3216f4da71005ed7782f6b655b33129e /fs/ufs/util.h | |
parent | 489e5d8c7652b9ba230481a3782d25a8e7d08467 (diff) | |
download | linux-7e26a3ff695d2ebf8836f682ab1b5b284ad7868d.tar.xz |
ufs: fix braino in ufs_get_inode_gid() for solaris UFS flavour
[ Upstream commit 4e9036042fedaffcd868d7f7aa948756c48c637d ]
To choose whether to pick the GID from the old (16bit) or new (32bit)
field, we should check if the old gid field is set to 0xffff. Mainline
checks the old *UID* field instead - cut'n'paste from the corresponding
code in ufs_get_inode_uid().
Fixes: 252e211e90ce
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/ufs/util.h')
-rw-r--r-- | fs/ufs/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/util.h b/fs/ufs/util.h index 1907be6d5808..f3092d513551 100644 --- a/fs/ufs/util.h +++ b/fs/ufs/util.h @@ -229,7 +229,7 @@ ufs_get_inode_gid(struct super_block *sb, struct ufs_inode *inode) case UFS_UID_44BSD: return fs32_to_cpu(sb, inode->ui_u3.ui_44.ui_gid); case UFS_UID_EFT: - if (inode->ui_u1.oldids.ui_suid == 0xFFFF) + if (inode->ui_u1.oldids.ui_sgid == 0xFFFF) return fs32_to_cpu(sb, inode->ui_u3.ui_sun.ui_gid); /* Fall through */ default: |