[arch-commits] Commit in mkinitcpio-busybox/trunk (2 files)

[Giancarlo Razzolini]

    Date: Monday, March 22, 2021 @ 11:48:07
  Author: grazzolini
Revision: 410698

upgpkg: mkinitcpio-busybox 1.32.1-3

Fix for FS#70075

Added:
  mkinitcpio-busybox/trunk/0002-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
Modified:
  mkinitcpio-busybox/trunk/PKGBUILD

---------------------------------------------------------+
 0002-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch |   57 ++++++++++++++
 PKGBUILD                                                |    5 -
 2 files changed, 61 insertions(+), 1 deletion(-)

Added: 0002-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
===================================================================
--- 0002-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch	                        (rev 0)
+++ 0002-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch	2021-03-22 11:48:07 UTC (rev 410698)
@@ -0,0 +1,57 @@
+From f25d254dfd4243698c31a4f3153d4ac72aa9e9bd Mon Sep 17 00:00:00 2001
+From: Samuel Sapalski <samuel.sapalski at nokia.com>
+Date: Wed, 3 Mar 2021 16:31:22 +0100
+Subject: [PATCH] decompress_gunzip: Fix DoS if gzip is corrupt
+
+On certain corrupt gzip files, huft_build will set the error bit on
+the result pointer. If afterwards abort_unzip is called huft_free
+might run into a segmentation fault or an invalid pointer to
+free(p).
+
+In order to mitigate this, we check in huft_free if the error bit
+is set and clear it before the linked list is freed.
+
+Signed-off-by: Samuel Sapalski <samuel.sapalski at nokia.com>
+Signed-off-by: Peter Kaestle <peter.kaestle at nokia.com>
+Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
+---
+ archival/libarchive/decompress_gunzip.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
+index eb3b64930..e93cd5005 100644
+--- a/archival/libarchive/decompress_gunzip.c
++++ b/archival/libarchive/decompress_gunzip.c
+@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = {
+  * each table.
+  * t: table to free
+  */
++#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
++#define ERR_RET     ((huft_t*)(uintptr_t)1)
+ static void huft_free(huft_t *p)
+ {
+ 	huft_t *q;
+ 
++	/*
++	 * If 'p' has the error bit set we have to clear it, otherwise we might run
++	 * into a segmentation fault or an invalid pointer to free(p)
++	 */
++	if (BAD_HUFT(p)) {
++		p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET));
++	}
++
+ 	/* Go through linked list, freeing from the malloced (t[-1]) address. */
+ 	while (p) {
+ 		q = (--p)->v.t;
+@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current
+  * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table
+  * is given: "fixed inflate" decoder feeds us such data.
+  */
+-#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
+-#define ERR_RET     ((huft_t*)(uintptr_t)1)
+ static huft_t* huft_build(const unsigned *b, const unsigned n,
+ 			const unsigned s, const struct cp_ext *cp_ext,
+ 			unsigned *m)
+-- 
+2.31.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-22 11:25:21 UTC (rev 410697)
+++ PKGBUILD	2021-03-22 11:48:07 UTC (rev 410698)
@@ -5,7 +5,7 @@
 
 pkgname=mkinitcpio-busybox
 pkgver=1.32.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Base initramfs tools'
 arch=(x86_64)
 url="https://www.busybox.net/"
@@ -14,10 +14,12 @@
 options=(!buildflags)
 source=(https://busybox.net/downloads/busybox-$pkgver.tar.bz2{,.sig}
         0001-ash-fix-unset_var-pattern-repl.patch
+        0002-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
         config)
 sha256sums=('9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee'
             'SKIP'
             '4e4fb268c51e378a3ad0a12f903a601a136d31cae8b684a51ebabbc9a6cf9250'
+            'cdc11deae6bb32d0994a252d545f6624513f7f46e44e9dca259f243fc87f598f'
             '81843d10a63f3e29f37560ded54a049b45c8a4b38560bf9489ec4124eead170e')
 validpgpkeys=('C9E9416F76E610DBD09D040F47B70C55ACC9965B') # Denis Vlasenko <vda.linux at googlemail.com>
 
@@ -25,6 +27,7 @@
   cd "busybox-$pkgver"
 
   patch -Np1 < ../0001-ash-fix-unset_var-pattern-repl.patch
+  patch -Np1 < ../0002-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch
 
   local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"