aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-05-01 22:46:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-25 18:22:30 +0200
commit8258661858d56b5ec28f830da32d942e0687a3c0 (patch)
tree642889240a96b267836bab40aefb898845d747f9
parent5b73764a5d2cd625929fd5b21d9697b841368364 (diff)
downloadlinux-yocto-8258661858d56b5ec28f830da32d942e0687a3c0.tar.gz
linux-yocto-8258661858d56b5ec28f830da32d942e0687a3c0.tar.bz2
linux-yocto-8258661858d56b5ec28f830da32d942e0687a3c0.zip
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>
-rw-r--r--fs/ufs/util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/util.h b/fs/ufs/util.h
index 1fd3011ea623..7fd4802222b8 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: