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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,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 2CC8AC282DD for ; Thu, 23 May 2019 19:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03A0F217F9 for ; Thu, 23 May 2019 19:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638631; bh=97IRIs3gLrfSnPdxUy1ZyEwZGxnbK110X/WNgklQPk8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=In3uTa1Z86VWIzKACeGNWB/tRLQi+TIHsTRc2g4phjPkPgN4XoW+CZWwL9UvYPsnK 8f0PWzJilqgCMspC8FVu+bGiMc9gqB34h6wTC4W7W6ORhxGc1jzgr1dBJSrfw1iC2F QAcI3wwCy7WOBVpzsgKd6V7D8da/WUHf+atE4XQc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387839AbfEWTK3 (ORCPT ); Thu, 23 May 2019 15:10:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:43766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387821AbfEWTK1 (ORCPT ); Thu, 23 May 2019 15:10:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 87DEB217D9; Thu, 23 May 2019 19:10:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638627; bh=97IRIs3gLrfSnPdxUy1ZyEwZGxnbK110X/WNgklQPk8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gs1CpTqXRMX1S4yZuGSQBHHoVi4tfgeyiti6V5+2/Jk4GmKvel3TQ+PrC522SxXIt m2PqoYyDc3DHhUlyINbCNRNm0b5yerdoHPmbz+8ctd8jZrYRq5/HvQa9N/MRHxiRdt T2HJiAIOFtGYp7Qc0tPpub/v109GUAtaMBdJosTg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Al Viro , Sasha Levin Subject: [PATCH 4.9 49/53] ufs: fix braino in ufs_get_inode_gid() for solaris UFS flavour Date: Thu, 23 May 2019 21:06:13 +0200 Message-Id: <20190523181718.718899106@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181710.981455400@linuxfoundation.org> References: <20190523181710.981455400@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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 398019fb14481..9c4fb1fc0822a 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