From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86A4FC04AAF for ; Thu, 16 May 2019 11:42:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AF3220833 for ; Thu, 16 May 2019 11:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558006969; bh=2VwLVPXRY8r7CQMu8ilIfQKvLvFOcNZjwr1s8fY6Gmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nP0+Xj8EzGyur4cXYaoJSBud9tvlieq4HJbJ5HBEPOtp9lvIkp/Q0p6IzmB1vmeqH kaaJiGPG11HiTuoTEev3cZThzYi2/SDS9KUD5GQT1LiBv9IgPh6QRnTtOZ8lcoBj1E th2iuRIKlX6LMG3NOQbLKnUvOxMTcRRTy1huRkfE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728537AbfEPLms (ORCPT ); Thu, 16 May 2019 07:42:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:50792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728407AbfEPLl5 (ORCPT ); Thu, 16 May 2019 07:41:57 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3966F21726; Thu, 16 May 2019 11:41:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558006916; bh=2VwLVPXRY8r7CQMu8ilIfQKvLvFOcNZjwr1s8fY6Gmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z5DkSD/ocIcuAFuV0aqB1hHFMdpdzhYtkOMTH3dworz5k/bccRJnJv6FmQzE8mnql M5nzyevRFjK+oe5sm9ytdxFZ06LMyKFswrQI7EqNFDrpaGaz75CpfbH526UyKU3V1G KqBJEaOOFm0zWBvwAFLJaLiKxp8nPykFiLX3Mxfw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Al Viro , Sasha Levin Subject: [PATCH AUTOSEL 4.4 7/8] ufs: fix braino in ufs_get_inode_gid() for solaris UFS flavour Date: Thu, 16 May 2019 07:41:45 -0400 Message-Id: <20190516114146.9267-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190516114146.9267-1-sashal@kernel.org> References: <20190516114146.9267-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro [ 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 Signed-off-by: Sasha Levin --- 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 3f9463f8cf2fa..f877d5cadd981 100644 --- a/fs/ufs/util.h +++ b/fs/ufs/util.h @@ -228,7 +228,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