summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2022-06-09 22:27:32 -0400
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-06-11 00:20:47 +0000
commit4afa2c4818f0699cfe612b1013995c842aa9f994 (patch)
tree5d7beb28f7cfa450f3c9ee5726ca670f222d7c83
parentMerge pull request #177211 from NixOS/backport-177204-to-release-22.05 (diff)
downloadnixpkgs-4afa2c4818f0699cfe612b1013995c842aa9f994.tar.gz
refind: Fix possible NULL dereference
This was observed with U-Boot. See the upstream change. - https://sourceforge.net/p/refind/code/merge-requests/45/ (cherry picked from commit eb900ded42e95632bcc06f3b19238c9222c2ba8c)
-rw-r--r--pkgs/tools/bootloaders/refind/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 8d46197214c0..2381402534e1 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gnu-efi, nixosTests }:
+{ lib, stdenv, fetchurl, fetchpatch, gnu-efi, nixosTests }:
let
archids = {
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
patches = [
# Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds.
./0001-toolchain.patch
+
+ # Fixes issue with null dereference in ReadHiddenTags
+ # Upstream: https://sourceforge.net/p/refind/code/merge-requests/45/
+ (fetchpatch {
+ url = "https://github.com/samueldr/rEFInd/commit/29cd79dedabf84d5ddfe686f5692278cae6cc4d6.patch";
+ sha256 = "sha256-/jAmOwvMmFWazyukN+ru1tQDiIBtgGk/e/pczsl1Xc8=";
+ })
];
buildInputs = [ gnu-efi ];