summary refs log tree commit diff
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authorTredwellGit <tredwell@tutanota.com>2021-05-30 02:08:18 +0000
committerTredwellGit <tredwell@tutanota.com>2021-05-30 02:08:18 +0000
commit2acd087dca93a3b589721b3ec32d13d9150684bb (patch)
tree56d74d742f53f7aa38ef1b7dbdb8ada9559fad7b /pkgs/tools/compression
parent3227025acfb9e7de043aea3c8fc30ad57a9d22a6 (diff)
downloadnixpkgs-2acd087dca93a3b589721b3ec32d13d9150684bb.tar
nixpkgs-2acd087dca93a3b589721b3ec32d13d9150684bb.tar.gz
nixpkgs-2acd087dca93a3b589721b3ec32d13d9150684bb.tar.bz2
nixpkgs-2acd087dca93a3b589721b3ec32d13d9150684bb.tar.lz
nixpkgs-2acd087dca93a3b589721b3ec32d13d9150684bb.tar.xz
nixpkgs-2acd087dca93a3b589721b3ec32d13d9150684bb.tar.zst
nixpkgs-2acd087dca93a3b589721b3ec32d13d9150684bb.zip
lz4: patch CVE-2021-3520 and null pointer dereference
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/lz4/default.nix13
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index e2bb98a4b80..94f739a6c53 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -14,6 +14,19 @@ stdenv.mkDerivation rec {
     owner = pname;
   };
 
+  patches = [
+    (fetchpatch { # https://github.com/lz4/lz4/pull/972
+      name = "CVE-2021-3520.patch";
+      url = "https://github.com/lz4/lz4/commit/8301a21773ef61656225e264f4f06ae14462bca7.patch";
+      sha256 = "0r1cwpqdkdc8im0pf2r5jp7mwwn69xcw405rrk7rc0mpjcp5ydfk";
+    })
+    (fetchpatch { # https://github.com/lz4/lz4/pull/973
+      name = "avoid-null-pointer-dereference.patch";
+      url = "https://github.com/lz4/lz4/commit/29a6a1f4941e7243241fe00d6c13b749fd6b60c2.patch";
+      sha256 = "0v5yl5hd3qrfm3xm7m06j4b21qwllb4cqkjn2az7x1vnzqgpf8y7";
+    })
+  ];
+
   # TODO(@Ericson2314): Separate binaries and libraries
   outputs = [ "bin" "out" "dev" ];