From e70ead8965be7d28cc851cf8775d4029b44ff827 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 12 Sep 2023 11:37:35 +0200 Subject: [PATCH] mtr: import a patch from upstream to fix segfault MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- pkgs/tools/networking/mtr/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index bf324c57d497..c586d6a75ef1 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