aboutsummaryrefslogtreecommitdiff
path: root/archival/tar.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-08-10 11:52:42 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-08-10 11:52:42 +0200
commitbc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7 (patch)
tree72672bb0c187b93f1fba99012cf0c4e716214298 /archival/tar.c
parent0cf64c8b5d86d603903397bfce87dea5a862caec (diff)
downloadbusybox-w32-bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7.tar.gz
busybox-w32-bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7.tar.bz2
busybox-w32-bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7.zip
libarchive: do not extract unsafe symlinks unless $EXTRACT_UNSAFE_SYMLINKS=1
function old new delta unsafe_symlink_target - 147 +147 unzip_main 2711 2732 +21 copy_file 1657 1678 +21 tar_main 999 971 -28 data_extract_all 1038 984 -54 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 2/2 up/down: 189/-82) Total: 107 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/tar.c')
-rw-r--r--archival/tar.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/archival/tar.c b/archival/tar.c
index 73c14ca81..9a5bcc7fe 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -278,23 +278,6 @@ static void chksum_and_xwrite(int fd, struct tar_header_t* hp)
278 xwrite(fd, hp, sizeof(*hp)); 278 xwrite(fd, hp, sizeof(*hp));
279} 279}
280 280
281static void replace_symlink_placeholders(llist_t *list)
282{
283 while (list) {
284 char *target;
285
286 target = list->data + strlen(list->data) + 1;
287 if (symlink(target, list->data)) {
288 /* shared message */
289 bb_error_msg_and_die("can't create %slink '%s' to '%s'",
290 "sym",
291 list->data, target
292 );
293 }
294 list = list->link;
295 }
296}
297
298#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS 281#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
299static void writeLongname(int fd, int type, const char *name, int dir) 282static void writeLongname(int fd, int type, const char *name, int dir)
300{ 283{
@@ -1255,8 +1238,6 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1255 while (get_header_tar(tar_handle) == EXIT_SUCCESS) 1238 while (get_header_tar(tar_handle) == EXIT_SUCCESS)
1256 bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */ 1239 bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */
1257 1240
1258 replace_symlink_placeholders(tar_handle->symlink_placeholders);
1259
1260 /* Check that every file that should have been extracted was */ 1241 /* Check that every file that should have been extracted was */
1261 while (tar_handle->accept) { 1242 while (tar_handle->accept) {
1262 if (!find_list_entry(tar_handle->reject, tar_handle->accept->data) 1243 if (!find_list_entry(tar_handle->reject, tar_handle->accept->data)