mirror of
https://git.jff.email/cgit/dmidecode.git
synced 2026-08-12 12:05:44 +00:00
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
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))
|