From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Vong Subject: Re: [PATCH] gnu: tar: Fix CVE-2016-6321. Date: Sat, 31 Dec 2016 22:57:50 +0800 Message-ID: <87tw9km9ht.fsf@gmail.com> References: <87h95kplte.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cNL6w-0001U7-8v for guix-devel@gnu.org; Sat, 31 Dec 2016 09:58:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cNL6t-00059l-6q for guix-devel@gnu.org; Sat, 31 Dec 2016 09:58:18 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:32915) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cNL6s-00059I-VF for guix-devel@gnu.org; Sat, 31 Dec 2016 09:58:15 -0500 Received: by mail-pf0-x244.google.com with SMTP id 127so13150608pfg.0 for ; Sat, 31 Dec 2016 06:58:14 -0800 (PST) In-Reply-To: <87h95kplte.fsf@gmail.com> (Alex Vong's message of "Sat, 31 Dec 2016 16:03:25 +0800") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain This is an updated version of the patch. There is only a minor stylish change, spaces in local.mk are changed to tabs. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-tar-Fix-CVE-2016-6321.patch Content-Transfer-Encoding: quoted-printable From=200cf96ac1167906565c560a12ab730d2192779315 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sat, 31 Dec 2016 00:05:49 +0800 Subject: [PATCH] gnu: tar: Fix CVE-2016-6321. * gnu/packages/patches/tar-CVE-2016-6321.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (tar)[source]: Add it. =2D-- gnu/local.mk | 1 + gnu/packages/base.scm | 3 +- gnu/packages/patches/tar-CVE-2016-6321.patch | 51 ++++++++++++++++++++++++= ++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/tar-CVE-2016-6321.patch diff --git a/gnu/local.mk b/gnu/local.mk index 69633131e..9137a466e 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -862,6 +862,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/t1lib-CVE-2010-2642.patch \ %D%/packages/patches/t1lib-CVE-2011-0764.patch \ %D%/packages/patches/t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.pat= ch \ + %D%/packages/patches/tar-CVE-2016-6321.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ %D%/packages/patches/tcl-mkindex-deterministic.patch \ %D%/packages/patches/tclxml-3.2-install.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 50c306009..ce6e3782c 100644 =2D-- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -162,7 +162,8 @@ implementation offers several extensions over the stand= ard utility.") (sha256 (base32 "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0")) =2D (patches (search-patches "tar-skip-unreliable-tests.patch"))= )) + (patches (search-patches "tar-CVE-2016-6321.patch" + "tar-skip-unreliable-tests.patch")))) (build-system gnu-build-system) ;; Note: test suite requires ~1GiB of disk space. (arguments diff --git a/gnu/packages/patches/tar-CVE-2016-6321.patch b/gnu/packages/pa= tches/tar-CVE-2016-6321.patch new file mode 100644 index 000000000..9e6ee653d =2D-- /dev/null +++ b/gnu/packages/patches/tar-CVE-2016-6321.patch @@ -0,0 +1,51 @@ +Fix CVE-2016-6321: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=3DCVE-2016-6321 +https://security-tracker.debian.org/tracker/CVE-2016-6321 + +Patches copied from upstream source repository +(with modification to NEWS removed since it hunks out to a reject file): + +http://git.savannah.gnu.org/cgit/tar.git/commit/?id=3D7340f67b9860ea0531c1= 450e5aa261c50f67165d + +From 7340f67b9860ea0531c1450e5aa261c50f67165d Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sat, 29 Oct 2016 21:04:40 -0700 +Subject: [PATCH] When extracting, skip ".." members + +* NEWS: Document this. +* src/extract.c (extract_archive): Skip members whose names +contain "..". +--- + NEWS | 8 +++++++- + src/extract.c | 8 ++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/src/extract.c b/src/extract.c +index f982433..7904148 100644 +--- 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; +=20 + fatal_exit_hook =3D extract_finish; +=20 + set_next_block_after (current_header); +=20 ++ skip_dotdot_name =3D (!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))) + { +--=20 +2.11.0 + =2D-=20 2.11.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEqfDnz3vyW/9qCtmBbrDlEZNRhYAFAlhnx28ACgkQbrDlEZNR hYAbVQf/QnMhHxObwH8Yo2m98WspWJp08fAVmFaNl8aL/Q6NnSGvomb4IUjNdtks ICt8Fly3xa3CH3vLurkgNFATsyFCBAZ08fhI1ljj3FOp1aeNGTMQDqIXdu+NEpJb VS1BDoHvntyRZ3Oe2If1uYd7js7S2+pJzfLi/p4R5/XuURw96Di/FaMRPtmPWLmH aN7js/Cx/tl340tsvQfZ9i/nMioyhh8/SfjlxQ2S3IoU5/vr+QDU032oqFBA2tMP zTfHmRnAfrFaw49hz90V4uvIbq7UO4UVFKIA7F8Za2E5WVYFv12fULaMFkfVhgfJ VWTVojuvuYsYGpFUogogEnQGEKqwlw== =XMln -----END PGP SIGNATURE----- --==-=-=--