mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lei Qiu <750592120@qq.com>
To: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
	Yangtao Li <frank.li@vivo.com>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH] hfs/hfsplus: validate uid and gid mount options
Date: Tue, 17 Nov 2026 10:44:47 +0800	[thread overview]
Message-ID: <tencent_4FE79C24049B83A9919143E7B141952DFC0A@qq.com> (raw)
In-Reply-To: <20261117024431.21914-1-750592120@qq.com>

The conversions to the new mount API declare uid and gid as fsparam_u32
but consume result.uid and result.gid. This bypasses make_kuid() and
make_kgid() as well as the validity checks in the old parsers. As a
result, both filesystems accept the invalid ID 4294967295, and IDs
supplied through fsconfig() in a non-initial user namespace are treated
as raw kernel IDs instead of being translated through that namespace.

Use fsparam_uid and fsparam_gid so the shared parser translates the IDs
and rejects invalid or unmapped values before storing the typed result.

Verify both modules with W=1 builds and a before/after QEMU test covering
fsconfig(), legacy mounts, and a filesystem context configured from a
user namespace mapping ID 0 to ID 1000. The fix rejects invalid IDs with
EINVAL and preserves the mapped ownership and valid mount options.

OpenAI Codex assisted with identifying the issue, implementing the fix
and reproducer, and running the validation.

Fixes: ffcd06b6d13b ("hfs: convert hfs to use the new mount api")
Fixes: 432f7c78cb00 ("hfsplus: convert hfsplus to use the new mount api")
Cc: stable@vger.kernel.org
Signed-off-by: Lei Qiu <750592120@qq.com>
---
 fs/hfs/super.c       | 4 ++--
 fs/hfsplus/options.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 5e6d66ff4..4309cc23d 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -203,8 +203,8 @@ enum {
 };
 
 static const struct fs_parameter_spec hfs_param_spec[] = {
-	fsparam_u32	("uid",		opt_uid),
-	fsparam_u32	("gid",		opt_gid),
+	fsparam_uid("uid", opt_uid),
+	fsparam_gid("gid", opt_gid),
 	fsparam_u32oct	("umask",	opt_umask),
 	fsparam_u32oct	("file_umask",	opt_file_umask),
 	fsparam_u32oct	("dir_umask",	opt_dir_umask),
diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c
index 9b377481f..3ec428142 100644
--- a/fs/hfsplus/options.c
+++ b/fs/hfsplus/options.c
@@ -33,8 +33,8 @@ static const struct fs_parameter_spec hfs_param_spec[] = {
 	fsparam_string	("creator",	opt_creator),
 	fsparam_string	("type",	opt_type),
 	fsparam_u32oct	("umask",	opt_umask),
-	fsparam_u32	("uid",		opt_uid),
-	fsparam_u32	("gid",		opt_gid),
+	fsparam_uid("uid", opt_uid),
+	fsparam_gid("gid", opt_gid),
 	fsparam_u32	("part",	opt_part),
 	fsparam_u32	("session",	opt_session),
 	fsparam_string	("nls",		opt_nls),

base-commit: a804c5742bff224d4cb4d25dd383554d598be32b


       reply	other threads:[~2026-11-17  2:44 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20261117024431.21914-1-750592120@qq.com>
2026-11-17  2:44 ` Lei Qiu [this message]
2026-11-18  8:28 ` [PATCH v2] " Lei Qiu
2026-11-18 18:49   ` Viacheslav Dubeyko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tencent_4FE79C24049B83A9919143E7B141952DFC0A@qq.com \
    --to=750592120@qq.com \
    --cc=frank.li@vivo.com \
    --cc=glaubitz@physik.fu-berlin.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®