xfs_profile: fix permission octet when suid/guid is set
PATCH 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.
Before:
wall --g2755 0 0 rootfs/usr/bin/wall
sudo -u-4755 0 0 rootfs/usr/bin/sudo
This wrongly generates (suid + 475 permissions):
-r-Srwxr-x. 1 root root 514704 Apr 16 11:56 /usr/bin/su
After:
wall --g755 0 0 rootfs/usr/bin/wall
sudo -u-755 0 0 rootfs/usr/bin/sudo
This correctly generates (suid + 755 permissions):
-rwsr-xr-x 1 root root 514704 Apr 16 11:56 /usr/bin/su
--- mkfs/xfs_protofile.in | 6 ++++++ 1 file changed, 6 insertions(+)
mkfs/xfs_protofile.in +6 -0
@@ -43,7 +43,13 @@ def stat_to_str(statbuf): else: sgid = '-' + # We already register suid in the proto string, no need + # to also represent it into the octet perms = stat.S_IMODE(statbuf.st_mode) + if suid == 'u': + perms = perms & ~stat.S_ISUID + if sgid == 'g': + perms = perms & ~stat.S_ISGID return '%s%s%s%03o %d %d' % (type, suid, sgid, perms, statbuf.st_uid, \ statbuf.st_gid)
2.49.0
Quoted 35 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.Before:
wall --g2755 0 0 rootfs/usr/bin/wall
sudo -u-4755 0 0 rootfs/usr/bin/sudoThis wrongly generates (suid + 475 permissions):
-r-Srwxr-x. 1 root root 514704 Apr 16 11:56 /usr/bin/suAfter:
wall --g755 0 0 rootfs/usr/bin/wall
sudo -u-755 0 0 rootfs/usr/bin/sudoThis correctly generates (suid + 755 permissions):
-rwsr-xr-x 1 root root 514704 Apr 16 11:56 /usr/bin/suSigned-off-by Luca Di Maio <[email protected]>--- mkfs/xfs_protofile.in | 6 ++++++ 1 file changed, 6 insertions(+)mkfs/xfs_protofile.in +0
-0
mkfs/xfs_protofile.in def stat_to_str(statbuf): · line 52
Quoted 10 lines
mkfs/xfs_protofile.in +6
-0@@ -43,7 +43,13 @@ def stat_to_str(statbuf): else: sgid = '-' + # We already register suid in the proto string, no need + # to also represent it into the octet perms = stat.S_IMODE(statbuf.st_mode) + if suid == 'u': + perms = perms & ~stat.S_ISUID + if sgid == 'g': + perms = perms & ~stat.S_ISGID
Hmm. The mode parser only pays attention to positions 3-5 in the mode string:
val = 0;
for (i = 3; i < 6; i++) {
if (mstr[i] < '0' || mstr[i] > '7') {
fprintf(stderr, _("%s: bad format string %s\n"),
progname, mstr);
exit(1);
}
val = val * 8 + mstr[i] - '0';
}
mode |= val;so I think xfs_protofile should be masking more:
perms = stat.S_IMODE(statbuf.st_mode) & 0o777
because otherwise we leak the sticky bit (S_ISVTX) into the protofile.
--D
Quoted 4 lines
mkfs/xfs_protofile.in +0
-0return '%s%s%s%03o %d %d' % (type, suid, sgid, perms, statbuf.st_uid, \ statbuf.st_gid)2.49.0
Quoted 14 lines · Darrick J. Wong
Hmm. The mode parser only pays attention to positions 3-5 in the mode string:
val = 0; for (i = 3; i < 6; i++) { if (mstr[i] < '0' || mstr[i] > '7') { fprintf(stderr, _("%s: bad format string %s\n"), progname, mstr); exit(1); } val = val * 8 + mstr[i] - '0'; } mode |= val;
Quoted 12 lines
so I think
xfs_protofileshould be masking more:perms = stat.S_IMODE(statbuf.st_mode) & 0o777because otherwise we leak the sticky bit (
S_ISVTX) into the protofile.--D
Quoted 4 lines
return '%s%s%s%03o %d %d' % (type, suid, sgid, perms, statbuf.st_uid, \ statbuf.st_gid)2.49.0
Thanks Darrik,
I've sent a v2 Patch implementing this, co-authoring you let me know if this is ok
Thanks
L.