diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-04-11 12:42:49 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-04-11 12:42:49 +0200 |
| commit | 90c5e13046b20e062ea525777fd8cdc526f79d0b (patch) | |
| tree | b9d6a57d25c5b86a6480ca6aa3ceb11374cebb13 /debian/patches/0140-Fix_scan_entry_point.patch | |
| parent | 3ea1b60e99bc51d73a9f95fef88aa49db9a61908 (diff) | |
| parent | 4993c9d0832ddc5b3531f294605e08da1a56c48a (diff) | |
Merge branch 'release/debian/3.2-3'debian/3.2-3
Diffstat (limited to 'debian/patches/0140-Fix_scan_entry_point.patch')
| -rw-r--r-- | debian/patches/0140-Fix_scan_entry_point.patch | 54 |
1 files changed, 54 insertions, 0 deletions
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..4183af5 --- /dev/null +++ b/debian/patches/0140-Fix_scan_entry_point.patch @@ -0,0 +1,54 @@ +Description: Cherry picked fix Only scan /dev/mem for entry point on x86 +Author: <name and email of author, optional> +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 ++++ trunk/dmidecode.c +@@ -2,7 +2,7 @@ + * DMI Decode + * + * Copyright (C) 2000-2002 Alan Cox <alan@redhat.com> +- * Copyright (C) 2002-2018 Jean Delvare <jdelvare@suse.de> ++ * Copyright (C) 2002-2019 Jean Delvare <jdelvare@suse.de> + * + * 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)) |