From 689a87788019fb7f08affd56d19aedc41c45360d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2019 10:30:10 +0100 Subject: Fix Scan only /dev/mem for entry point on x86 --- debian/patches/0140-Fix_scan_entry_point.patch | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 debian/patches/0140-Fix_scan_entry_point.patch (limited to 'debian/patches/0140-Fix_scan_entry_point.patch') diff --git a/debian/patches/0140-Fix_scan_entry_point.patch b/debian/patches/0140-Fix_scan_entry_point.patch new file mode 100644 index 0000000..9a8aa93 --- /dev/null +++ b/debian/patches/0140-Fix_scan_entry_point.patch @@ -0,0 +1,47 @@ +Index: trunk/dmidecode.c +=================================================================== +--- trunk.orig/dmidecode.c ++++ trunk/dmidecode.c +@@ -2,7 +2,7 @@ + * DMI Decode + * + * Copyright (C) 2000-2002 Alan Cox +- * Copyright (C) 2002-2018 Jean Delvare ++ * Copyright (C) 2002-2019 Jean Delvare + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -5534,7 +5534,7 @@ int main(int argc, char * const argv[]) + off_t fp; + size_t size; + int efi; +- u8 *buf; ++ u8 *buf = NULL; + + /* + * We don't want stdout and stderr to be mixed up if both are +@@ -5638,7 +5638,7 @@ int main(int argc, char * const argv[]) + printf("Failed to get SMBIOS data from sysfs.\n"); + } + +- /* Next try EFI (ia64, Intel-based Mac) */ ++ /* Next try EFI (ia64, Intel-based Mac, arm64) */ + efi = address_from_efi(&fp); + switch (efi) + { +@@ -5671,6 +5671,7 @@ int main(int argc, char * const argv[]) + goto done; + + memory_scan: ++#if defined __i386__ || defined __x86_64__ + if (!(opt.flags & FLAG_QUIET)) + printf("Scanning %s for entry point.\n", opt.devmem); + /* Fallback to memory scan (x86, x86_64) */ +@@ -5713,6 +5714,7 @@ memory_scan: + } + } + } ++#endif + + done: + if (!found && !(opt.flags & FLAG_QUIET)) -- cgit v1.2.3 From e40e5703b00b588953ecdf95151b345d130aef66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2019 10:49:45 +0100 Subject: Add DEP3 Header to patch --- debian/patches/0140-Fix_scan_entry_point.patch | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian/patches/0140-Fix_scan_entry_point.patch') diff --git a/debian/patches/0140-Fix_scan_entry_point.patch b/debian/patches/0140-Fix_scan_entry_point.patch index 9a8aa93..4183af5 100644 --- a/debian/patches/0140-Fix_scan_entry_point.patch +++ b/debian/patches/0140-Fix_scan_entry_point.patch @@ -1,3 +1,10 @@ +Description: Cherry picked fix Only scan /dev/mem for entry point on x86 +Author: +Origin: upstream, http://git.savannah.nongnu.org/cgit/dmidecode.git/commit/?id=e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946911 +Last-Update: 2019-12-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/dmidecode.c =================================================================== --- trunk.orig/dmidecode.c -- cgit v1.2.3