From patchwork Tue May 25 18:24:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Solene Rapenne X-Patchwork-Id: 29595 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8667C27BC81; Tue, 25 May 2021 19:31:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0FCDF27BC78 for ; Tue, 25 May 2021 19:31:29 +0100 (BST) Received: from localhost ([::1]:57140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llbpw-00076N-8p for patchwork@mira.cbaines.net; Tue, 25 May 2021 14:31:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llbjl-0007f7-2h for guix-patches@gnu.org; Tue, 25 May 2021 14:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llbji-0007x2-96 for guix-patches@gnu.org; Tue, 25 May 2021 14:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1llbji-0008Ku-67 for guix-patches@gnu.org; Tue, 25 May 2021 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48656] [PATCH] gnu: lz4: Add a patch for CVE-2021-3520. Resent-From: Solene Rapenne Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 May 2021 18:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48656 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48656@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162196706931998 (code B ref -1); Tue, 25 May 2021 18:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 May 2021 18:24:29 +0000 Received: from localhost ([127.0.0.1]:46734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llbjB-0008K2-DQ for submit@debbugs.gnu.org; Tue, 25 May 2021 14:24:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:60800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llbj7-0008Jr-Qe for submit@debbugs.gnu.org; Tue, 25 May 2021 14:24:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llbj7-00070L-B3 for guix-patches@gnu.org; Tue, 25 May 2021 14:24:25 -0400 Received: from perso.pw ([163.172.223.238]:17711) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llbj5-0007gp-41 for guix-patches@gnu.org; Tue, 25 May 2021 14:24:25 -0400 Received: from perso.pw (localhost [127.0.0.1]) by perso.pw (OpenSMTPD) with ESMTP id 694815d8 for ; Tue, 25 May 2021 20:24:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=perso.pw; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; s=1337; bh=dNy+jjGmGe+VR1TsY24mVSgjH lQ=; b=pAwOpf+PKL+9SbFi1JBxrPPboPb3TPnCcq6l8gZjbuGDAeE1B1R/reCtV Y2J2S4mLLwJlWIMus0lapxG4NT/fT7oazzuuvp8K7f8OD+w7krp8cJu8gfkgbVmB NjeBTEbWBb/LRGxd0Ds9FwuJAqQNAOUpu613hiXo7GlPpumBMI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=perso.pw; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=1337; b=MjemXaWE8ffyWqt5Z+l stIomTsjmg7p3OdCwltXrYC/1V67Iq323KKnlm7QcVs5NJzp9k1lOooBvT59GMh6 lJY4JQZlz9txlq6h12/zSQ4YPBa/hQH/nSJgodY3zx/jkaw75/AdMAxnV0/tjjjO APxt4xJd84uaIhwIkKsqMTuw= Received: from localhost (176-154-164-34.abo.bbox.fr [176.154.164.34]) by perso.pw (OpenSMTPD) with ESMTPSA id 9266ae62 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Tue, 25 May 2021 20:24:09 +0200 (CEST) Date: Tue, 25 May 2021 20:24:07 +0200 Message-ID: <20210525202407.383e1713@perso.pw> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Received-SPF: pass client-ip=163.172.223.238; envelope-from=solene@perso.pw; helo=perso.pw X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Solene Rapenne X-ACL-Warn: , Solene Rapenne via Guix-patches X-Patchwork-Original-From: Solene Rapenne via Guix-patches via From: Solene Rapenne X-getmail-retrieved-from-mailbox: Patches This imports a patch that is not committed upstream yet but pending for merge on github https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7 This is already widely used in many distributions distributing lz4 --- gnu/packages/compression.scm | 7 +++++-- gnu/packages/patches/lz4-CVE-2021-3520.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/lz4-CVE-2021-3520.patch diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 64816a30c0..53ab999151 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Antoine Côté ;;; Copyright © 2021 Vincent Legoll ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 Solene Rapenne ;;; ;;; This file is part of GNU Guix. ;;; @@ -810,15 +811,17 @@ decompression of some loosely related file formats used by Microsoft.") (commit (string-append "v" version)))) (sha256 (base32 "1w02kazh1fps3sji2sn89fz862j1199c5ajrqcgl1bnlxj09kcbz")) + (patches + (search-patches "lz4-CVE-2021-3520.patch")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (outputs (list "out" "static")) (native-inputs - `(;; For tests. + `( ;; For tests. ("python" ,python) ("valgrind" ,valgrind))) (arguments - `(;; Not designed for parallel testing. + `( ;; Not designed for parallel testing. ;; See https://github.com/lz4/lz4/issues/957#issuecomment-737419821 #:parallel-tests? #f #:test-target "test" diff --git a/gnu/packages/patches/lz4-CVE-2021-3520.patch b/gnu/packages/patches/lz4-CVE-2021-3520.patch new file mode 100644 index 0000000000..100baa4758 --- /dev/null +++ b/gnu/packages/patches/lz4-CVE-2021-3520.patch @@ -0,0 +1,15 @@ +Not merged patch fixing CVE-2021-3520 +https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7 + +Index: b/lib/lz4.c +--- a/lib/lz4.c.orig ++++ b/lib/lz4.c +@@ -1749,7 +1749,7 @@ LZ4_decompress_generic( + const size_t dictSize /* note : = 0 if noDict */ + ) + { +- if (src == NULL) { return -1; } ++ if ((src == NULL) || (outputSize < 0)) { return -1; } + + { const BYTE* ip = (const BYTE*) src; + const BYTE* const iend = ip + srcSize;