From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 728EB1A76AB; Tue, 30 Jul 2024 17:27:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722360424; cv=none; b=Wu5AVOykNSyXYs3AjYc7O+KutNkQq3/2xsKhKE8lsK82fh4E1/R4AiNOeDvP6QVMewlfeVx1IulR+gGl0Z4p8Qjtpz2GpmQ0m1p6nzvuP8kjvJzUfSZbWM0bESwRaZ08rEpYFxi69w79kjCG1sFY3wkf5ifcapgRnHFDjSNyFH4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722360424; c=relaxed/simple; bh=AwFdvN5IIE8NgTGL8DkLQ6jTt8Dw8XK447Ez2l94RG8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t5q9Pu8dCg7JYRbJGU3/VfRLiRrwFVFUP1iYpl3BnMWC+IyKoX/aXuos6YfnFon0taSVW4a/JNGNCHYS7SOFK7tZeSCgtor6DqnmHtBWTtbWuS5nq5UldJ4SaDwei3q3mh/yc6mJu1mj34Fk6PdncE3PBMe5C17rxztPq+PLKJ0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SsJ7qOCA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SsJ7qOCA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3E60C4AF0C; Tue, 30 Jul 2024 17:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722360424; bh=AwFdvN5IIE8NgTGL8DkLQ6jTt8Dw8XK447Ez2l94RG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SsJ7qOCAlwVHp0WfMQdutajuHoZ88sbLupJpcV3QXodZzu5KykGxjkx6lvV6BDJ8N t69RZz2Ed+jpTB82j4BmoOo3WfT3R5X2WIdy+gJ6Y+gAuMBjRfZdBamUaI9P5iYZv4 d4pi/eQ8vWx2Guyo3XmXQVLXf7W+pY32sleMHBjY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ross Lagerwall , Alain Knaff , "H. Peter Anvin" , Andrew Morton Subject: [PATCH 6.10 664/809] decompress_bunzip2: fix rare decompression failure Date: Tue, 30 Jul 2024 17:49:00 +0200 Message-ID: <20240730151751.128453462@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151724.637682316@linuxfoundation.org> References: <20240730151724.637682316@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ross Lagerwall commit bf6acd5d16057d7accbbb1bf7dc6d8c56eeb4ecc upstream. The decompression code parses a huffman tree and counts the number of symbols for a given bit length. In rare cases, there may be >= 256 symbols with a given bit length, causing the unsigned char to overflow. This causes a decompression failure later when the code tries and fails to find the bit length for a given symbol. Since the maximum number of symbols is 258, use unsigned short instead. Link: https://lkml.kernel.org/r/20240717162016.1514077-1-ross.lagerwall@citrix.com Fixes: bc22c17e12c1 ("bzip2/lzma: library support for gzip, bzip2 and lzma decompression") Signed-off-by: Ross Lagerwall Cc: Alain Knaff Cc: "H. Peter Anvin" Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- lib/decompress_bunzip2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c @@ -232,7 +232,8 @@ static int INIT get_next_block(struct bu RUNB) */ symCount = symTotal+2; for (j = 0; j < groupCount; j++) { - unsigned char length[MAX_SYMBOLS], temp[MAX_HUFCODE_BITS+1]; + unsigned char length[MAX_SYMBOLS]; + unsigned short temp[MAX_HUFCODE_BITS+1]; int minLen, maxLen, pp; /* Read Huffman code lengths for each symbol. They're stored in a way similar to mtf; record a starting