|
 |
e0d5ce |
From 82497fa02d60757c2cfa645cf89a79abb1435273 Mon Sep 17 00:00:00 2001
|
|
|
e0d5ce |
From: Jean Delvare <jdelvare@suse.de>
|
|
|
e0d5ce |
Date: Fri, 16 Nov 2018 11:18:25 +0100
|
|
|
e0d5ce |
Subject: [PATCH 2/5] dmidecode: Don't use memcpy on /dev/mem on arm64
|
|
|
e0d5ce |
|
|
|
e0d5ce |
On arm64, calling memcpy on /dev/mem will cause a bus error if the
|
|
|
e0d5ce |
start and the end of the buffer are not aligned on a 64-bit boundary.
|
|
|
e0d5ce |
Using option --no-sysfs triggers this.
|
|
|
e0d5ce |
|
|
|
e0d5ce |
Use a slow manual byte-by-byte copy in that case, to prevent the bus
|
|
|
e0d5ce |
error. This is only a fallback path (at least on Linux) and not
|
|
|
e0d5ce |
performance-critical anyway, as it is a one-time operation and DMI
|
|
|
e0d5ce |
tables are usually not too large.
|
|
|
e0d5ce |
|
|
|
e0d5ce |
This fixes bug #55026:
|
|
|
e0d5ce |
https://savannah.nongnu.org/bugs/index.php?55026
|
|
|
e0d5ce |
|
|
|
e0d5ce |
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
|
e0d5ce |
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
|
e0d5ce |
---
|
|
|
e0d5ce |
config.h | 5 +++++
|
|
|
e0d5ce |
util.c | 14 +++++++++++++-
|
|
|
e0d5ce |
2 files changed, 18 insertions(+), 1 deletion(-)
|
|
|
e0d5ce |
|
|
|
e0d5ce |
diff --git a/config.h b/config.h
|
|
|
e0d5ce |
index e39091fde502..423735537fa8 100644
|
|
|
e0d5ce |
--- a/config.h
|
|
|
e0d5ce |
+++ b/config.h
|
|
|
e0d5ce |
@@ -26,4 +26,9 @@
|
|
|
e0d5ce |
#define ALIGNMENT_WORKAROUND
|
|
|
e0d5ce |
#endif
|
|
|
e0d5ce |
|
|
|
e0d5ce |
+/* Avoid unaligned memcpy on /dev/mem */
|
|
|
e0d5ce |
+#ifdef __aarch64__
|
|
|
e0d5ce |
+#define USE_SLOW_MEMCPY
|
|
|
e0d5ce |
+#endif
|
|
|
e0d5ce |
+
|
|
|
e0d5ce |
#endif
|
|
|
e0d5ce |
diff --git a/util.c b/util.c
|
|
|
e0d5ce |
index eeffdae8e536..04aaadd5b913 100644
|
|
|
e0d5ce |
--- a/util.c
|
|
|
e0d5ce |
+++ b/util.c
|
|
|
e0d5ce |
@@ -155,6 +155,18 @@ void *read_file(off_t base, size_t *max_len, const char *filename)
|
|
|
e0d5ce |
return p;
|
|
|
e0d5ce |
}
|
|
|
e0d5ce |
|
|
|
e0d5ce |
+static void safe_memcpy(void *dest, const void *src, size_t n)
|
|
|
e0d5ce |
+{
|
|
|
e0d5ce |
+#ifdef USE_SLOW_MEMCPY
|
|
|
e0d5ce |
+ size_t i;
|
|
|
e0d5ce |
+
|
|
|
e0d5ce |
+ for (i = 0; i < n; i++)
|
|
|
e0d5ce |
+ *((u8 *)dest + i) = *((const u8 *)src + i);
|
|
|
e0d5ce |
+#else
|
|
|
e0d5ce |
+ memcpy(dest, src, n);
|
|
|
e0d5ce |
+#endif
|
|
|
e0d5ce |
+}
|
|
|
e0d5ce |
+
|
|
|
e0d5ce |
/*
|
|
|
e0d5ce |
* Copy a physical memory chunk into a memory buffer.
|
|
|
e0d5ce |
* This function allocates memory.
|
|
|
e0d5ce |
@@ -214,7 +226,7 @@ void *mem_chunk(off_t base, size_t len, const char *devmem)
|
|
|
e0d5ce |
if (mmp == MAP_FAILED)
|
|
|
e0d5ce |
goto try_read;
|
|
|
e0d5ce |
|
|
|
e0d5ce |
- memcpy(p, (u8 *)mmp + mmoffset, len);
|
|
|
e0d5ce |
+ safe_memcpy(p, (u8 *)mmp + mmoffset, len);
|
|
|
e0d5ce |
|
|
|
e0d5ce |
if (munmap(mmp, mmoffset + len) == -1)
|
|
|
e0d5ce |
{
|
|
|
e0d5ce |
--
|
|
|
e0d5ce |
2.17.1
|
|
|
e0d5ce |
|