Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge

Conflicts:
	coreutils/ls.c
	shell/ash.c

3 files changed, 41 insertions, 19 deletions

diff --git a/archival/libarchive/data_extract_to_command.c b/archival/libarchive/data_extract_to_command.c
index 2bbab7641..0e977049d 100644
--- a/archival/libarchive/data_extract_to_command.c
+++ b/archival/libarchive/data_extract_to_command.c
@@ -99,8 +99,12 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle)
                         close(p[1]);
                         xdup2(p[0], STDIN_FILENO);
                         signal(SIGPIPE, SIG_DFL);
-                        execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", archive_handle->tar__to_command, NULL);
-                        bb_perror_msg_and_die("can't execute '%s'", DEFAULT_SHELL);
+                        execl(archive_handle->tar__to_command_shell,
+                                archive_handle->tar__to_command_shell,
+                                "-c",
+                                archive_handle->tar__to_command,
+                                NULL);
+                        bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell);
                 }
                 close(p[0]);
                 /* Our caller is expected to do signal(SIGPIPE, SIG_IGN)
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 2e0332792..f73cd338e 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -18,6 +18,35 @@ typedef uint32_t aliased_uint32_t FIX_ALIASING;
 typedef off_t    aliased_off_t    FIX_ALIASING;
 
 
+const char* FAST_FUNC strip_unsafe_prefix(const char *str)
+{
+        const char *cp = str;
+        while (1) {
+                char *cp2;
+                if (*cp == '/') {
+                        cp++;
+                        continue;
+                }
+                if (strncmp(cp, "/../"+1, 3) == 0) {
+                        cp += 3;
+                        continue;
+                }
+                cp2 = strstr(cp, "/../");
+                if (!cp2)
+                        break;
+                cp = cp2 + 4;
+        }
+        if (cp != str) {
+                static smallint warned = 0;
+                if (!warned) {
+                        warned = 1;
+                        bb_error_msg("removing leading '%.*s' from member names",
+                                (int)(cp - str), str);
+                }
+        }
+        return cp;
+}
+
 /* NB: _DESTROYS_ str[len] character! */
 static unsigned long long getOctal(char *str, int len)
 {
@@ -422,12 +451,9 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
                 p_linkname = NULL;
         }
 #endif
-        if (strncmp(file_header->name, "/../"+1, 3) == 0
-         || strstr(file_header->name, "/../")
-        ) {
-                bb_error_msg_and_die("name with '..' encountered: '%s'",
-                                file_header->name);
-        }
+
+        /* Everything up to and including last ".." component is stripped */
+        overlapping_strcpy(file_header->name, strip_unsafe_prefix(file_header->name));
 
         /* Strip trailing '/' in directories */
         /* Must be done after mode is set as '/' is used to check if it's a directory */
diff --git a/archival/tar.c b/archival/tar.c
index 74d6fca91..52f3c364c 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -397,17 +397,8 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
 
         DBG("writeFileToTarball('%s')", fileName);
 
-        /* Strip leading '/' (must be before memorizing hardlink's name) */
-        header_name = fileName;
-        while (header_name[0] == '/') {
-                static smallint warned;
-
-                if (!warned) {
-                        bb_error_msg("removing leading '/' from member names");
-                        warned = 1;
-                }
-                header_name++;
-        }
+        /* Strip leading '/' and such (must be before memorizing hardlink's name) */
+        header_name = strip_unsafe_prefix(fileName);
 
         if (header_name[0] == '\0')
                 return TRUE;
@@ -981,6 +972,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 putenv((char*)"TAR_FILETYPE=f");
                 signal(SIGPIPE, SIG_IGN);
                 tar_handle->action_data = data_extract_to_command;
+                IF_FEATURE_TAR_TO_COMMAND(tar_handle->tar__to_command_shell = xstrdup(get_shell_name());)
         }
 
         if (opt & OPT_KEEP_OLD)