mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing type in mknodat() mode argument

Browse Source 
Per POSIX, the type of the file to be created should be OR'ed to the
`mode` argument of mknodat().

However, set_xattr() creates an empty file using mknodat() and does not
do that.

E.g. Linux kernel considers zero type as S_IFREG, so the code works on
most systems.

However, e.g. fakeroot, at least up to the current v1.36, does not
consider 0 as S_IFREG, instead creating an invalid file, causing tar to
enter an infinite retry loop when trying to create a file with xattrs
under fakeroot.

Since set_xattr is used only when extracting regular files, fix that
by ORing its mode argument with S_IFREG.

Copyright-paperwork-exempt: Yes
This commit is contained in:
Anssi Hannula
2024-11-06 12:43:32 +02:00
committed by Sergey Poznyakoff
parent 65228e9ba9
commit 827dde1605
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/extract.c
View File

@@ -969,7 +969,7 @@ set_xattr (char const *file_name, struct tar_stat_info const *st,
#ifdef HAVE_XATTRS #ifdef HAVE_XATTRS
if (xattrs_option && st->xattr_map.xm_size) if (xattrs_option && st->xattr_map.xm_size)
{ {
int r = mknodat (chdir_fd, file_name, mode, 0); int r = mknodat (chdir_fd, file_name, mode | S_IFREG, 0);
if (r < 0) if (r < 0)
return r; return r;
xattrs_xattrs_set (st, file_name, typeflag, false); xattrs_xattrs_set (st, file_name, typeflag, false);