Merge branch 'busybox' into merge

3 files changed, 101 insertions, 54 deletions

diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c
index 45776dcbe..bd034afdc 100644
--- a/archival/libarchive/data_extract_all.c
+++ b/archival/libarchive/data_extract_all.c
@@ -11,6 +11,12 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         file_header_t *file_header = archive_handle->file_header;
         int dst_fd;
         int res;
+        char *hard_link;
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+        char *dst_name;
+#else
+# define dst_name (file_header->name)
+#endif
 
 #if ENABLE_FEATURE_TAR_SELINUX
         char *sctx = archive_handle->tar__sctx[PAX_NEXT_FILE];
@@ -23,11 +29,49 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         }
 #endif
 
+        /* Hard links are encoded as regular files of size 0
+         * with a nonempty link field */
+        hard_link = NULL;
+        if (S_ISREG(file_header->mode) && file_header->size == 0)
+                hard_link = file_header->link_target;
+
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+        dst_name = file_header->name;
+        if (archive_handle->tar__strip_components) {
+                unsigned n = archive_handle->tar__strip_components;
+                do {
+                        dst_name = strchr(dst_name, '/');
+                        if (!dst_name || dst_name[1] == '\0') {
+                                data_skip(archive_handle);
+                                goto ret;
+                        }
+                        dst_name++;
+                        /*
+                         * Link target is shortened only for hardlinks:
+                         * softlinks restored unchanged.
+                         */
+                        if (hard_link) {
+// GNU tar 1.26 does not check that we reached end of link name:
+// if "dir/hardlink" is hardlinked to "file",
+// tar xvf a.tar --strip-components=1 says:
+//  tar: hardlink: Cannot hard link to '': No such file or directory
+// and continues processing. We silently skip such entries.
+                                hard_link = strchr(hard_link, '/');
+                                if (!hard_link || hard_link[1] == '\0') {
+                                        data_skip(archive_handle);
+                                        goto ret;
+                                }
+                                hard_link++;
+                        }
+                } while (--n != 0);
+        }
+#endif
+
         if (archive_handle->ah_flags & ARCHIVE_CREATE_LEADING_DIRS) {
-                char *slash = strrchr(file_header->name, '/');
+                char *slash = strrchr(dst_name, '/');
                 if (slash) {
                         *slash = '\0';
-                        bb_make_directory(file_header->name, -1, FILEUTILS_RECUR);
+                        bb_make_directory(dst_name, -1, FILEUTILS_RECUR);
                         *slash = '/';
                 }
         }
@@ -35,12 +79,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         if (archive_handle->ah_flags & ARCHIVE_UNLINK_OLD) {
                 /* Remove the entry if it exists */
                 if (!S_ISDIR(file_header->mode)) {
-                        /* Is it hardlink?
-                         * We encode hard links as regular files of size 0 with a symlink */
-                        if (S_ISREG(file_header->mode)
-                         && file_header->link_target
-                         && file_header->size == 0
-                        ) {
+                        if (hard_link) {
                                 /* Ugly special case:
                                  * tar cf t.tar hardlink1 hardlink2 hardlink1
                                  * results in this tarball structure:
@@ -48,22 +87,22 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                                  * hardlink2 -> hardlink1
                                  * hardlink1 -> hardlink1 <== !!!
                                  */
-                                if (strcmp(file_header->link_target, file_header->name) == 0)
+                                if (strcmp(hard_link, dst_name) == 0)
                                         goto ret;
                         }
                         /* Proceed with deleting */
-                        if (unlink(file_header->name) == -1
+                        if (unlink(dst_name) == -1
                          && errno != ENOENT
                         ) {
                                 bb_perror_msg_and_die("can't remove old file %s",
-                                                file_header->name);
+                                                dst_name);
                         }
                 }
         }
         else if (archive_handle->ah_flags & ARCHIVE_EXTRACT_NEWER) {
                 /* Remove the existing entry if its older than the extracted entry */
                 struct stat existing_sb;
-                if (lstat(file_header->name, &existing_sb) == -1) {
+                if (lstat(dst_name, &existing_sb) == -1) {
                         if (errno != ENOENT) {
                                 bb_perror_msg_and_die("can't stat old file");
                         }
@@ -73,30 +112,25 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                          && !S_ISDIR(file_header->mode)
                         ) {
                                 bb_error_msg("%s not created: newer or "
-                                        "same age file exists", file_header->name);
+                                        "same age file exists", dst_name);
                         }
                         data_skip(archive_handle);
                         goto ret;
                 }
-                else if ((unlink(file_header->name) == -1) && (errno != EISDIR)) {
+                else if ((unlink(dst_name) == -1) && (errno != EISDIR)) {
                         bb_perror_msg_and_die("can't remove old file %s",
-                                        file_header->name);
+                                        dst_name);
                 }
         }
 
-        /* Handle hard links separately
-         * We encode hard links as regular files of size 0 with a symlink */
-        if (S_ISREG(file_header->mode)
-         && file_header->link_target
-         && file_header->size == 0
-        ) {
-                /* hard link */
-                res = link(file_header->link_target, file_header->name);
-                if ((res == -1) && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
+        /* Handle hard links separately */
+        if (hard_link) {
+                res = link(hard_link, dst_name);
+                if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
                         bb_perror_msg("can't create %slink "
                                         "from %s to %s", "hard",
-                                        file_header->name,
-                                        file_header->link_target);
+                                        dst_name,
+                                        hard_link);
                 }
                 /* Hardlinks have no separate mode/ownership, skip chown/chmod */
                 goto ret;
@@ -106,17 +140,17 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         switch (file_header->mode & S_IFMT) {
         case S_IFREG: {
                 /* Regular file */
-                char *dst_name;
+                char *dst_nameN;
                 int flags = O_WRONLY | O_CREAT | O_EXCL;
                 if (archive_handle->ah_flags & ARCHIVE_O_TRUNC)
                         flags = O_WRONLY | O_CREAT | O_TRUNC;
-                dst_name = file_header->name;
+                dst_nameN = dst_name;
 #ifdef ARCHIVE_REPLACE_VIA_RENAME
                 if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME)
                         /* rpm-style temp file name */
-                        dst_name = xasprintf("%s;%x", dst_name, (int)getpid());
+                        dst_nameN = xasprintf("%s;%x", dst_name, (int)getpid());
 #endif
-                dst_fd = xopen3(dst_name,
+                dst_fd = xopen3(dst_nameN,
                         flags,
                         file_header->mode
                         );
@@ -124,32 +158,32 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                 close(dst_fd);
 #ifdef ARCHIVE_REPLACE_VIA_RENAME
                 if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) {
-                        xrename(dst_name, file_header->name);
-                        free(dst_name);
+                        xrename(dst_nameN, dst_name);
+                        free(dst_nameN);
                 }
 #endif
                 break;
         }
         case S_IFDIR:
-                res = mkdir(file_header->name, file_header->mode);
+                res = mkdir(dst_name, file_header->mode);
                 if ((res == -1)
                  && (errno != EISDIR) /* btw, Linux doesn't return this */
                  && (errno != EEXIST)
                  && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                 ) {
-                        bb_perror_msg("can't make dir %s", file_header->name);
+                        bb_perror_msg("can't make dir %s", dst_name);
                 }
                 break;
         case S_IFLNK:
                 /* Symlink */
 //TODO: what if file_header->link_target == NULL (say, corrupted tarball?)
-                res = symlink(file_header->link_target, file_header->name);
-                if ((res == -1)
+                res = symlink(file_header->link_target, dst_name);
+                if (res != 0
                  && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                 ) {
                         bb_perror_msg("can't create %slink "
                                 "from %s to %s", "sym",
-                                file_header->name,
+                                dst_name,
                                 file_header->link_target);
                 }
                 break;
@@ -157,11 +191,11 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
         case S_IFBLK:
         case S_IFCHR:
         case S_IFIFO:
-                res = mknod(file_header->name, file_header->mode, file_header->device);
+                res = mknod(dst_name, file_header->mode, file_header->device);
                 if ((res == -1)
                  && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
                 ) {
-                        bb_perror_msg("can't create node %s", file_header->name);
+                        bb_perror_msg("can't create node %s", dst_name);
                 }
                 break;
         default:
@@ -186,20 +220,20 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                         }
 #endif
                         /* GNU tar 1.15.1 uses chown, not lchown */
-                        chown(file_header->name, uid, gid);
+                        chown(dst_name, uid, gid);
                 }
                 /* uclibc has no lchmod, glibc is even stranger -
                  * it has lchmod which seems to do nothing!
                  * so we use chmod... */
                 if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_PERM)) {
-                        chmod(file_header->name, file_header->mode);
+                        chmod(dst_name, file_header->mode);
                 }
                 if (archive_handle->ah_flags & ARCHIVE_RESTORE_DATE) {
                         struct timeval t[2];
 
                         t[1].tv_sec = t[0].tv_sec = file_header->mtime;
                         t[1].tv_usec = t[0].tv_usec = 0;
-                        utimes(file_header->name, t);
+                        utimes(dst_name, t);
                 }
         }
 
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index b6ae7f738..eb64645ae 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -308,11 +308,11 @@ static int huft_build(const unsigned *b, const unsigned n,
         unsigned i;             /* counter, current code */
         unsigned j;             /* counter */
         int k;                  /* number of bits in current code */
-        unsigned *p;            /* pointer into c[], b[], or v[] */
+        const unsigned *p;      /* pointer into c[], b[], or v[] */
         huft_t *q;              /* points to current table */
         huft_t r;               /* table entry for structure assignment */
         huft_t *u[BMAX];        /* table stack */
-        unsigned v[N_MAX];      /* values in order of bit length */
+        unsigned v[N_MAX + 1];  /* values in order of bit length. last v[] is never used */
         int ws[BMAX + 1];       /* bits decoded stack */
         int w;                  /* bits decoded */
         unsigned x[BMAX + 1];   /* bit offsets, then code stack */
@@ -327,7 +327,7 @@ static int huft_build(const unsigned *b, const unsigned n,
 
         /* Generate counts for each bit length */
         memset(c, 0, sizeof(c));
-        p = (unsigned *) b; /* cast allows us to reuse p for pointing to b */
+        p = b;
         i = n;
         do {
                 c[*p]++; /* assume all entries <= BMAX */
@@ -367,8 +367,12 @@ static int huft_build(const unsigned *b, const unsigned n,
                 *xp++ = j;
         }
 
-        /* Make a table of values in order of bit lengths */
-        p = (unsigned *) b;
+        /* Make a table of values in order of bit lengths.
+         * To detect bad input, unused v[i]'s are set to invalid value UINT_MAX.
+         * In particular, last v[i] is never filled and must not be accessed.
+         */
+        memset(v, 0xff, sizeof(v));
+        p = b;
         i = 0;
         do {
                 j = *p++;
@@ -435,7 +439,9 @@ static int huft_build(const unsigned *b, const unsigned n,
 
                         /* set up table entry in r */
                         r.b = (unsigned char) (k - w);
-                        if (p >= v + n) {
+                        if (/*p >= v + n || -- redundant, caught by the second check: */
+                            *p == UINT_MAX /* do we access uninited v[i]? (see memset(v))*/
+                        ) {
                                 r.e = 99; /* out of values--invalid code */
                         } else if (*p < s) {
                                 r.e = (unsigned char) (*p < 256 ? 16 : 15);     /* 256 is EOB code */
@@ -520,8 +526,9 @@ static NOINLINE int inflate_codes(STATE_PARAM_ONLY)
                 e = t->e;
                 if (e > 16)
                         do {
-                                if (e == 99)
-                                        abort_unzip(PASS_STATE_ONLY);;
+                                if (e == 99) {
+                                        abort_unzip(PASS_STATE_ONLY);
+                                }
                                 bb >>= t->b;
                                 k -= t->b;
                                 e -= 16;
@@ -557,8 +564,9 @@ static NOINLINE int inflate_codes(STATE_PARAM_ONLY)
                         e = t->e;
                         if (e > 16)
                                 do {
-                                        if (e == 99)
+                                        if (e == 99) {
                                                 abort_unzip(PASS_STATE_ONLY);
+                                        }
                                         bb >>= t->b;
                                         k -= t->b;
                                         e -= 16;
@@ -824,8 +832,9 @@ static int inflate_block(STATE_PARAM smallint *e)
 
                 b_dynamic >>= 4;
                 k_dynamic -= 4;
-                if (nl > 286 || nd > 30)
+                if (nl > 286 || nd > 30) {
                         abort_unzip(PASS_STATE_ONLY);   /* bad lengths */
+                }
 
                 /* read in bit-length-code lengths */
                 for (j = 0; j < nb; j++) {
@@ -906,12 +915,14 @@ static int inflate_block(STATE_PARAM smallint *e)
                 bl = lbits;
 
                 i = huft_build(ll, nl, 257, cplens, cplext, &inflate_codes_tl, &bl);
-                if (i != 0)
+                if (i != 0) {
                         abort_unzip(PASS_STATE_ONLY);
+                }
                 bd = dbits;
                 i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &inflate_codes_td, &bd);
-                if (i != 0)
+                if (i != 0) {
                         abort_unzip(PASS_STATE_ONLY);
+                }
 
                 /* set up data for inflate_codes() */
                 inflate_codes_setup(PASS_STATE bl, bd);
@@ -999,6 +1010,7 @@ inflate_unzip_internal(STATE_PARAM transformer_state_t *xstate)
         error_msg = "corrupted data";
         if (setjmp(error_jmp)) {
                 /* Error from deep inside zip machinery */
+                bb_error_msg(error_msg);
                 n = -1;
                 goto ret;
         }
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index fb68673b9..ac2be726f 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -418,6 +418,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 
         /* Everything up to and including last ".." component is stripped */
         overlapping_strcpy(file_header->name, strip_unsafe_prefix(file_header->name));
+//TODO: do the same for file_header->link_target?
 
         /* Strip trailing '/' in directories */
         /* Must be done after mode is set as '/' is used to check if it's a directory */