From d811a840772a0a5db1d6ad49567b2bfc5f15f4dd Mon Sep 17 00:00:00 2001 From: Daniel Dickinson Date: Sat, 30 Jul 2016 01:23:29 -0400 Subject: [PATCH] utils/tar: Fix tar build dependency and CVE-2016-6321 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should be PKG_BUILD_DEPENDS not BUILD_DEPENDS Signed-off-by: Daniel Dickinson Signed-off-by: Álvaro Fernández Rojas --- utils/tar/Makefile | 4 +-- utils/tar/patches/001-CVE-2016-6321.patch | 30 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 utils/tar/patches/001-CVE-2016-6321.patch diff --git a/utils/tar/Makefile b/utils/tar/Makefile index 96a64215be..45befbf3a8 100644 --- a/utils/tar/Makefile +++ b/utils/tar/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tar PKG_VERSION:=1.29 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 -BUILD_DEPENDS:=xz +PKG_BUILD_DEPENDS:=xz include $(INCLUDE_DIR)/package.mk diff --git a/utils/tar/patches/001-CVE-2016-6321.patch b/utils/tar/patches/001-CVE-2016-6321.patch new file mode 100644 index 0000000000..0783473763 --- /dev/null +++ b/utils/tar/patches/001-CVE-2016-6321.patch @@ -0,0 +1,30 @@ +From 7340f67b9860ea0531c1450e5aa261c50f67165d Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sat, 29 Oct 2016 21:04:40 -0700 +Subject: When extracting, skip ".." members + +* src/extract.c (extract_archive): Skip members whose names +contain "..". +--- a/src/extract.c ++++ b/src/extract.c +@@ -1629,12 +1629,20 @@ extract_archive (void) + { + char typeflag; + tar_extractor_t fun; ++ bool skip_dotdot_name; + + fatal_exit_hook = extract_finish; + + set_next_block_after (current_header); + ++ skip_dotdot_name = (!absolute_names_option ++ && contains_dot_dot (current_stat_info.orig_file_name)); ++ if (skip_dotdot_name) ++ ERROR ((0, 0, _("%s: Member name contains '..'"), ++ quotearg_colon (current_stat_info.orig_file_name))); ++ + if (!current_stat_info.file_name[0] ++ || skip_dotdot_name + || (interactive_option + && !confirm ("extract", current_stat_info.file_name))) + {