about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish.is@lostca.se>2023-09-12 11:37:35 +0200
committerAshish SHUKLA <ashish.is@lostca.se>2023-09-12 11:37:39 +0200
commite70ead8965be7d28cc851cf8775d4029b44ff827 (patch)
tree16ded0fcad885b69c98c4f022b87aff37596ab55 /pkgs/tools
parentdb9208ab987cdeeedf78ad9b4cf3c55f5ebd269b (diff)
mtr: import a patch from upstream to fix segfault
There is a buffer overflow problem in mtr which is fixed upstream, and
can be reproduced with:

   ❯ mtr -z -4 -c 5  -w example.com
   Start: 2023-09-12T09:38:31+0000
   *** buffer overflow detected ***: terminated
   [1]    293109 abort (core dumped)  mtr -z -4 -c 5 -w example.com
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/networking/mtr/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index bf324c57d497a..c586d6a75ef1d 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchpatch
 , autoreconfHook
 , pkg-config
 , libcap
@@ -21,6 +22,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-f5bL3IdXibIc1xXCuZHwcEV5vhypRE2mLsS3A8HW2QM=";
   };
 
+  patches = [ (fetchpatch { # https://github.com/traviscross/mtr/pull/468
+                url = "https://github.com/traviscross/mtr/commit/5908af4c19188cb17b62f23368b6ef462831a0cb.patch";
+                hash = "sha256-rTydtU8+Wc4nGEKh1GOkhcpgME4hwsACy82gKPaIe64=";
+              }) ];
+
   # we need this before autoreconfHook does its thing
   postPatch = ''
     echo ${version} > .tarball-version