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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C05CC63705 for ; Wed, 7 Dec 2022 20:17:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbiLGURY (ORCPT ); Wed, 7 Dec 2022 15:17:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbiLGURV (ORCPT ); Wed, 7 Dec 2022 15:17:21 -0500 Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2964E0F3 for ; Wed, 7 Dec 2022 12:17:18 -0800 (PST) Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1445ca00781so16049934fac.1 for ; Wed, 07 Dec 2022 12:17:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dubeyko-com.20210112.gappssmtp.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=sEx8KSd6M/54L2Poz9MZcu5n+KLYE7RdzT7Oy3ZvWZQ=; b=a5vOlXF4JUZQNcWlhUdUDAYIBDZv3IOLAFAohW2XoI9rwR2X/VY+H/ux3VztfMOa+R AZTbIM+LMvqOtkmZNUbuzrHzc9rHPn2VqNKudM3wOBvaEQiT37vQgwc0jv7fRDBwI/vL SwNgjOIPO8MEglyt8a/h6z6qaGa3NzUSXrp5R1DcJhgidyLvVmQ2kaKikujz3gP+arId ck3qW5vXsxcih8tDzy8OpjkC30cXzc0fSb9aG6ruDr/3+91ATWYscyGf0HQ9y0+bPnZC xLHa8eRRByKUoxkgvLRhlM6hcGSt3AZirBLPy7mNCncKundokUcQ5UhZ8KMjszYxA+8z 1DIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sEx8KSd6M/54L2Poz9MZcu5n+KLYE7RdzT7Oy3ZvWZQ=; b=vry45h/WdJyGIE63WD6DbQAegeI6SPiPBSzm/HxiD9tibBwyS4St90y8ai45LUxf61 TCb/o5i9thguLHKfH4/glmyD23Ammjm03MxUOvlTDPBLKMJlzzbJrRr4iCVhP9iiLXD4 D5R4zYnuGnHIRciOKLDQ5TK6VtONvX9O1/3KCOmmEX24mVZ9X1bf13iDfrxTcUDN9N05 u5yuNUr/ml+Ai0X4gQALQhXpWCkyv2jXaLxlJDb9Wl5W9taDahujbo0znHTPtDhpeZoZ i1eRmqiEsxAiUxYcJkiy5tSJrPxM89ibx6kI2YE4IUr1GxZZ+Bu5j+9PlwWS2PFxTt3Z Mszg== X-Gm-Message-State: ANoB5pn1Y1Wqu/15VN0SjL4qe2hvjdR+Ae1awz24rWdf/VnGRawdUb47 /xPK7Wl16NNOLsgqeNjoFvQz+Q== X-Google-Smtp-Source: AA0mqf4Q6jcuI0xaALjHHV1uTyYpPiQ0FTylWK3YV4FrnqaTPAlVtnMeN9i8KLCvxpC5py5SmVmnvQ== X-Received: by 2002:a05:6871:a6a1:b0:144:1f08:c66b with SMTP id wh33-20020a056871a6a100b001441f08c66bmr16700065oab.279.1670444237949; Wed, 07 Dec 2022 12:17:17 -0800 (PST) Received: from smtpclient.apple (172-125-78-211.lightspeed.sntcca.sbcglobal.net. [172.125.78.211]) by smtp.gmail.com with ESMTPSA id eo7-20020a056870ec8700b001446a45bb49sm7767366oab.23.2022.12.07.12.17.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2022 12:17:17 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: [PATCH v2] hfsplus: Fix bug causing custom uid and gid being unable to be assigned with mount From: Viacheslav Dubeyko In-Reply-To: Date: Wed, 7 Dec 2022 12:17:14 -0800 Cc: "willy@infradead.org" , "ira.weiny@intel.com" , "axboe@kernel.dk" , Andrew Morton , "bvanassche@acm.org" , "keescook@chromium.org" , "songmuchun@bytedance.com" , "torvalds@linux-foundation.org" , "linux-fsdevel@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Content-Transfer-Encoding: quoted-printable Message-Id: <082FE5D4-5B72-4B4F-AC00-E0D52C7F8758@dubeyko.com> References: <93F5197D-2B61-4129-B5D4-771934F70577@live.com> To: Aditya Garg X-Mailer: Apple Mail (2.3696.120.41.1.1) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > On Dec 6, 2022, at 7:05 PM, Aditya Garg wrote: >=20 > From: Aditya Garg >=20 > Despite specifying UID and GID in mount command, the specified UID and = GID > were not being assigned. This patch fixes this issue. >=20 > Cc: stable@vger.kernel.org > Signed-off-by: Aditya Garg > --- > fs/hfsplus/hfsplus_fs.h | 2 ++ > fs/hfsplus/inode.c | 4 ++-- > fs/hfsplus/options.c | 4 ++++ > 3 files changed, 8 insertions(+), 2 deletions(-) >=20 > diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h > index a5db2e3b2..6aa919e59 100644 > --- a/fs/hfsplus/hfsplus_fs.h > +++ b/fs/hfsplus/hfsplus_fs.h > @@ -198,6 +198,8 @@ struct hfsplus_sb_info { > #define HFSPLUS_SB_HFSX 3 > #define HFSPLUS_SB_CASEFOLD 4 > #define HFSPLUS_SB_NOBARRIER 5 > +#define HFSPLUS_SB_UID 6 > +#define HFSPLUS_SB_GID 7 >=20 > static inline struct hfsplus_sb_info *HFSPLUS_SB(struct super_block = *sb) > { > diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c > index aeab83ed1..b675581aa 100644 > --- a/fs/hfsplus/inode.c > +++ b/fs/hfsplus/inode.c > @@ -192,11 +192,11 @@ static void hfsplus_get_perms(struct inode = *inode, > mode =3D be16_to_cpu(perms->mode); >=20 > i_uid_write(inode, be32_to_cpu(perms->owner)); > - if (!i_uid_read(inode) && !mode) > + if ((test_bit(HFSPLUS_SB_UID, &sbi->flags)) || = (!i_uid_read(inode) && !mode)) > inode->i_uid =3D sbi->uid; >=20 > i_gid_write(inode, be32_to_cpu(perms->group)); > - if (!i_gid_read(inode) && !mode) > + if ((test_bit(HFSPLUS_SB_GID, &sbi->flags)) || = (!i_gid_read(inode) && !mode)) > inode->i_gid =3D sbi->gid; >=20 > if (dir) { > diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c > index 047e05c57..c94a58762 100644 > --- a/fs/hfsplus/options.c > +++ b/fs/hfsplus/options.c > @@ -140,6 +140,8 @@ int hfsplus_parse_options(char *input, struct = hfsplus_sb_info *sbi) > if (!uid_valid(sbi->uid)) { > pr_err("invalid uid specified\n"); > return 0; > + } else { > + set_bit(HFSPLUS_SB_UID, &sbi->flags); > } > break; > case opt_gid: > @@ -151,6 +153,8 @@ int hfsplus_parse_options(char *input, struct = hfsplus_sb_info *sbi) > if (!gid_valid(sbi->gid)) { > pr_err("invalid gid specified\n"); > return 0; > + } else { > + set_bit(HFSPLUS_SB_GID, &sbi->flags); > } > break; > case opt_part: > --=20 > 2.38.1 >=20 Looks good. Reviewed-by: Viacheslav Dubeyko Thanks, Slava.