about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-10-01 19:27:59 +0200
committerGitHub <noreply@github.com>2022-10-01 19:27:59 +0200
commit7ff72a6310a0e9f9d52175f7fd2720a963e942db (patch)
tree7e1806db016fb69b8b282c07148b86627c791b54 /pkgs/servers
parent9da41230fba8949e93c8d81c5f330d2eb9099e6b (diff)
parent118179f32ad4e18e166daf2f4f612a79d1558b80 (diff)
Merge pull request #192146 from risicle/ris-frr-CVE-2022-37032
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/frr/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix
index c23e956972c21..1215fbd340943 100644
--- a/pkgs/servers/frr/default.nix
+++ b/pkgs/servers/frr/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 
 # build time
 , autoreconfHook
@@ -41,6 +42,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2022-37032.patch";
+      url = "https://github.com/FRRouting/frr/commit/ff6db1027f8f36df657ff2e5ea167773752537ed.patch";
+      sha256 = "sha256-b3nT6xco620hMSqlj/nTWTJCegf3ARAGaQbii4Yq6Ag=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     bison