a84db18fc7
This mostly reverts commit bc9bbeb2b8
"libarchive: do not extract unsafe symlinks unless $EXTRACT_UNSAFE_SYMLINKS=1"
Users report that it is somewhat too restrictive. See
https://bugs.busybox.net/show_bug.cgi?id=8411
In particular, this interferes with unpacking of busybox-based
filesystems with links like "sbin/applet" -> "../bin/busybox".
The change is made smaller by deleting ARCHIVE_EXTRACT_QUIET flag -
it is unused since 2010, and removing conditionals on it
allows commonalizing some error message codes.
function old new delta
create_or_remember_symlink - 94 +94
create_symlinks_from_list - 64 +64
tar_main 1002 1006 +4
unzip_main 2732 2724 -8
data_extract_all 984 891 -93
unsafe_symlink_target 147 - -147
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 1/2 up/down: 162/-248) Total: -86 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
42 lines
911 B
C
42 lines
911 B
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
#include "libbb.h"
|
|
#include "bb_archive.h"
|
|
|
|
void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders,
|
|
const char *target,
|
|
const char *linkname)
|
|
{
|
|
if (target[0] == '/' || strstr(target, "..")) {
|
|
llist_add_to(symlink_placeholders,
|
|
xasprintf("%s%c%s", linkname, '\0', target)
|
|
);
|
|
return;
|
|
}
|
|
if (symlink(target, linkname) != 0) {
|
|
/* shared message */
|
|
bb_perror_msg_and_die("can't create %slink '%s' to '%s'",
|
|
"sym", linkname, target
|
|
);
|
|
}
|
|
}
|
|
|
|
void FAST_FUNC create_symlinks_from_list(llist_t *list)
|
|
{
|
|
while (list) {
|
|
char *target;
|
|
|
|
target = list->data + strlen(list->data) + 1;
|
|
if (symlink(target, list->data)) {
|
|
/* shared message */
|
|
bb_error_msg_and_die("can't create %slink '%s' to '%s'",
|
|
"sym",
|
|
list->data, target
|
|
);
|
|
}
|
|
list = list->link;
|
|
}
|
|
}
|