* [PATCH v2] xfs_profile: fix permission octet when suid/guid is set
@ 2025-04-16 16:14 Luca Di Maio
2025-04-16 16:28 ` Darrick J. Wong
0 siblings, 1 reply; 3+ messages in thread
From: Luca Di Maio @ 2025-04-16 16:14 UTC (permalink / raw)
To: linux-xfs; +Cc: Luca Di Maio, dimitri.ledkov, smoser, Darrick J. Wong
When encountering suid or sgid files, we already set the `u` or `g` property
in the prototype file.
Given that proto.c only supports three numbers for permissions, we need to
remove the redundant information from the permission, else it was incorrectly
parsed.
[v1] -> [v2]
Improve masking as suggested
Co-authored-by: Luca Di Maio <luca.dimaio1@gmail.com>
Co-authored-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
---
mkfs/xfs_protofile.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mkfs/xfs_protofile.in b/mkfs/xfs_protofile.in
index e83c39f..9418e7f 100644
--- a/mkfs/xfs_protofile.in
+++ b/mkfs/xfs_protofile.in
@@ -43,7 +43,9 @@ def stat_to_str(statbuf):
else:
sgid = '-'
- perms = stat.S_IMODE(statbuf.st_mode)
+ # We already register suid in the proto string, no need
+ # to also represent it into the octet
+ perms = stat.S_IMODE(statbuf.st_mode) & 0o777
return '%s%s%s%03o %d %d' % (type, suid, sgid, perms, statbuf.st_uid, \
statbuf.st_gid)
--
2.49.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] xfs_profile: fix permission octet when suid/guid is set
2025-04-16 16:14 [PATCH v2] xfs_profile: fix permission octet when suid/guid is set Luca Di Maio
@ 2025-04-16 16:28 ` Darrick J. Wong
2025-04-16 21:20 ` Luca Di Maio
0 siblings, 1 reply; 3+ messages in thread
From: Darrick J. Wong @ 2025-04-16 16:28 UTC (permalink / raw)
To: Luca Di Maio; +Cc: linux-xfs, dimitri.ledkov, smoser
On Wed, Apr 16, 2025 at 06:14:13PM +0200, Luca Di Maio wrote:
> When encountering suid or sgid files, we already set the `u` or `g` property
> in the prototype file.
> Given that proto.c only supports three numbers for permissions, we need to
> remove the redundant information from the permission, else it was incorrectly
> parsed.
>
> [v1] -> [v2]
> Improve masking as suggested
>
> Co-authored-by: Luca Di Maio <luca.dimaio1@gmail.com>
> Co-authored-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
The subject line should say "xfs_protofile", not "xfs_profile".
With that fixed,
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
--D
> ---
> mkfs/xfs_protofile.in | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/mkfs/xfs_protofile.in b/mkfs/xfs_protofile.in
> index e83c39f..9418e7f 100644
> --- a/mkfs/xfs_protofile.in
> +++ b/mkfs/xfs_protofile.in
> @@ -43,7 +43,9 @@ def stat_to_str(statbuf):
> else:
> sgid = '-'
>
> - perms = stat.S_IMODE(statbuf.st_mode)
> + # We already register suid in the proto string, no need
> + # to also represent it into the octet
> + perms = stat.S_IMODE(statbuf.st_mode) & 0o777
>
> return '%s%s%s%03o %d %d' % (type, suid, sgid, perms, statbuf.st_uid, \
> statbuf.st_gid)
> --
> 2.49.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] xfs_profile: fix permission octet when suid/guid is set
2025-04-16 16:28 ` Darrick J. Wong
@ 2025-04-16 21:20 ` Luca Di Maio
0 siblings, 0 replies; 3+ messages in thread
From: Luca Di Maio @ 2025-04-16 21:20 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: linux-xfs
Sorry for the typo! Sent the fixed patch
L.
On Wed, Apr 16, 2025 at 6:28 PM Darrick J. Wong <djwong@kernel.org> wrote:
>
> On Wed, Apr 16, 2025 at 06:14:13PM +0200, Luca Di Maio wrote:
> > When encountering suid or sgid files, we already set the `u` or `g` property
> > in the prototype file.
> > Given that proto.c only supports three numbers for permissions, we need to
> > remove the redundant information from the permission, else it was incorrectly
> > parsed.
> >
> > [v1] -> [v2]
> > Improve masking as suggested
> >
> > Co-authored-by: Luca Di Maio <luca.dimaio1@gmail.com>
> > Co-authored-by: Darrick J. Wong <djwong@kernel.org>
> > Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
>
> The subject line should say "xfs_protofile", not "xfs_profile".
>
> With that fixed,
> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
>
> --D
>
> > ---
> > mkfs/xfs_protofile.in | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/mkfs/xfs_protofile.in b/mkfs/xfs_protofile.in
> > index e83c39f..9418e7f 100644
> > --- a/mkfs/xfs_protofile.in
> > +++ b/mkfs/xfs_protofile.in
> > @@ -43,7 +43,9 @@ def stat_to_str(statbuf):
> > else:
> > sgid = '-'
> >
> > - perms = stat.S_IMODE(statbuf.st_mode)
> > + # We already register suid in the proto string, no need
> > + # to also represent it into the octet
> > + perms = stat.S_IMODE(statbuf.st_mode) & 0o777
> >
> > return '%s%s%s%03o %d %d' % (type, suid, sgid, perms, statbuf.st_uid, \
> > statbuf.st_gid)
> > --
> > 2.49.0
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-16 21:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-16 16:14 [PATCH v2] xfs_profile: fix permission octet when suid/guid is set Luca Di Maio
2025-04-16 16:28 ` Darrick J. Wong
2025-04-16 21:20 ` Luca Di Maio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox