From 9f8c2fed5ca2b04ff5a9c6931060a6482c593c37 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 23 Mar 2025 19:55:55 +0100 Subject: [PATCH] grub2: remove security patch causing segfault with `grub-mount` / NTFS Issue is being worked on upstream, it seems preferable to remove the security patch in the meantime. Fixes #391308. --- pkgs/tools/misc/grub/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index bf4e95796ecc..f142862139d9 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -164,11 +164,8 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=048777bc29043403d077d41a81d0183767b8bc71"; hash = "sha256-Mm49MSLqCq143r8ruLJm1QoyCoLtOlCBfqoAPwPlv8E="; }) - (fetchpatch { - name = "18_fs_ntfs_implement_attribute_verification.patch"; - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=067b6d225d482280abad03944f04e30abcbdafa1"; - hash = "sha256-u1+K7WIw3uJG4OhMVP5aYsgJoXpgA5rcp3nJ0/aDU6I="; - }) + # Patch 18 (067b6d225d482280abad03944f04e30abcbdafa1) has been removed because it causes regressions + # https://lists.gnu.org/archive/html/grub-devel/2025-03/msg00067.html (fetchpatch { name = "19_fs_xfs_fix_out-of-bounds_read.patch"; url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6ccc77b59d16578b10eaf8a4fe85c20b229f0d8a";