ahill/toybox
1
0
Fork 0
mirror of https://codeberg.org/landley/toybox.git synced 2026-01-26 14:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tar SELinux header

Browse Source 
When comparing with files created by GNU tar, I noticed the following
difference:

61 RHT.security.selinux=unconfined_u:object_r:user_tmp_t:s0\x00\n
->
60 RHT.security.selinux=unconfined_u:object_r:user_tmp_t:s0\n

After making toybox tar match GNU one, it no longer complains about bad
header when trying to list the files inside.

Test: tar --selinux -cvf /tmp/a.tar /tmp/a
      tar --list -f /tmp/a.tar
This commit is contained in:
LuK1337 2025-03-09 17:57:32 +01:00 committed by Rob Landley
parent 922ed5dd6c
commit d1101f2fc8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toys/posix/tar.c
View File

@ -403,8 +403,8 @@ static int add_to_tar(struct dirtree *node)
if (len>999999 || (sz && len>sz)) len = -1, errno = E2BIG;
if (buf || len<1) {
if (len>0) {
strcpy(buf+start+sz, "\n");
write_prefix_block(buf, start+sz+2, 'x');
strcpy(buf+start+sz-1, "\n");
write_prefix_block(buf, start+sz, 'x');
} else if (errno==ENODATA || errno==ENOTSUP) len = 0;
if (len) perror_msg("getfilecon %s", name);
@ -415,7 +415,7 @@ static int add_to_tar(struct dirtree *node)
// Allocate buffer. Length includes prefix: calculate twice (wrap 99->100)
temp = snprintf(0, 0, "%d", sz = (start = 22)+len+1);
start += temp + (temp != snprintf(0, 0, "%d", temp+sz));
buf = xmprintf("%u RHT.%s=%.*s", start+len+1, sec, sz = len, "");
buf = xmprintf("%u RHT.%s=%.*s", start+len, sec, sz = len, "");
}
}