| From b91f9bb013cd6d619ded1f3a2ad8aeb04ad64bf3 Mon Sep 17 00:00:00 2001 |
| From: Al Viro <viro@zeniv.linux.org.uk> |
| Date: Wed, 1 May 2019 22:46:11 -0400 |
| Subject: 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> |
| --- |
| fs/ufs/util.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/fs/ufs/util.h b/fs/ufs/util.h |
| index 1fd3011ea6236..7fd4802222b8c 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: |
| -- |
| 2.20.1 |
| |
