jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs_fsys: fix extraction of symlinks 

Symlinks should use the real target filename instead of
the temporary extraction name.
cute-signatures
Timo Teräs 2021-11-15 15:54:17 +02:00
parent de281f0f83
commit 061bd69b80
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fs_fsys.c
View File

@ -102,11 +102,9 @@ static int fsys_file_extract(struct apk_ctx *ac, const struct apk_file_info *fi,
int atfd = apk_ctx_fd_dest(ac); int atfd = apk_ctx_fd_dest(ac);
const char *fn = fi->name, *link_target = fi->link_target; const char *fn = fi->name, *link_target = fi->link_target;
if (pkgctx.ptr) { if (pkgctx.ptr)
fn = format_tmpname(&ac->dctx, pkgctx, get_dirname(fn), APK_BLOB_STR(fn), tmpname_file); fn = format_tmpname(&ac->dctx, pkgctx, get_dirname(fn),
if (link_target) APK_BLOB_STR(fn), tmpname_file);
link_target = format_tmpname(&ac->dctx, pkgctx, get_dirname(link_target), APK_BLOB_STR(link_target), tmpname_linktarget);
}
if (!S_ISDIR(fi->mode) && !(extract_flags & APK_FSEXTRACTF_NO_OVERWRITE)) { if (!S_ISDIR(fi->mode) && !(extract_flags & APK_FSEXTRACTF_NO_OVERWRITE)) {
if (unlinkat(atfd, fn, 0) != 0 && errno != ENOENT) return -errno; if (unlinkat(atfd, fn, 0) != 0 && errno != ENOENT) return -errno;
@ -119,7 +117,7 @@ static int fsys_file_extract(struct apk_ctx *ac, const struct apk_file_info *fi,
ret = -errno; ret = -errno;
break; break;
case S_IFREG: case S_IFREG:
if (fi->link_target == NULL) { if (!link_target) {
int flags = O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC | O_EXCL; int flags = O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC | O_EXCL;
int fd = openat(atfd, fn, flags, fi->mode & 07777); int fd = openat(atfd, fn, flags, fi->mode & 07777);
if (fd < 0) { if (fd < 0) {
@ -138,6 +136,10 @@ static int fsys_file_extract(struct apk_ctx *ac, const struct apk_file_info *fi,
ret = r; ret = r;
} }
} else { } else {
// Hardlink needs to be done against the temporary name
if (pkgctx.ptr)
link_target = format_tmpname(&ac->dctx, pkgctx, get_dirname(link_target),
APK_BLOB_STR(link_target), tmpname_linktarget);
r = linkat(atfd, link_target, atfd, fn, 0); r = linkat(atfd, link_target, atfd, fn, 0);
if (r < 0) ret = -errno; if (r < 0) ret = -errno;
} }