xfs_profile: fix permission octet when suid/guid is set
PATCH v2 1/1 xfs_profile: fix permission octet when suid/guid is set
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
--- mkfs/xfs_protofile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mkfs/xfs_protofile.in +3 -1
@@ -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
Quoted 6 lines · Luca Di Maio
When encountering suid or sgid files, we already set the
uorgproperty in the prototype file.
Given thatproto.conly supports three numbers for permissions, we need to remove the redundant information from the permission, else it was incorrectly parsed.
Quoted 6 lines
[v1] -> [v2]
Improve masking as suggestedCo-authored-by Luca Di Maio <[email protected]>Co-authored-by Darrick J. Wong <[email protected]>Signed-off-by Luca Di Maio <[email protected]>
The subject line should say "xfs_protofile", not "xfs_profile".
With that fixed,
--D
Quoted 22 lines
--- mkfs/xfs_protofile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)mkfs/xfs_protofile.in +3
-2@@ -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
Sorry for the typo! Sent the fixed patch
L.
Quoted 44 lines · Darrick J. Wong
Quoted 6 lines · Luca Di Maio
When encountering suid or sgid files, we already set the
uorgproperty in the prototype file.
Given thatproto.conly supports three numbers for permissions, we need to remove the redundant information from the permission, else it was incorrectly parsed.Quoted 6 lines
[v1] -> [v2]
Improve masking as suggestedCo-authored-by Luca Di Maio <[email protected]>Co-authored-by Darrick J. Wong <[email protected]>Signed-off-by Luca Di Maio <[email protected]>The subject line should say "
xfs_protofile", not "xfs_profile".With that fixed,
Reviewed-by "Darrick J. Wong" <[email protected]>--D
Quoted 22 lines
--- mkfs/xfs_protofile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)mkfs/xfs_protofile.in +3
-2@@ -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