From fd8419c8c44930df3885c65f3a728c740654a123 Mon Sep 17 00:00:00 2001 From: Packit Bot Date: May 04 2021 22:15:54 +0000 Subject: Apply patch 0002-dmidecode-Don-t-use-memcpy-on-dev-mem-on-arm64.patch patch_name: 0002-dmidecode-Don-t-use-memcpy-on-dev-mem-on-arm64.patch present_in_specfile: true --- diff --git a/config.h b/config.h index e39091f..4237355 100644 --- a/config.h +++ b/config.h @@ -26,4 +26,9 @@ #define ALIGNMENT_WORKAROUND #endif +/* Avoid unaligned memcpy on /dev/mem */ +#ifdef __aarch64__ +#define USE_SLOW_MEMCPY +#endif + #endif diff --git a/util.c b/util.c index eeffdae..04aaadd 100644 --- a/util.c +++ b/util.c @@ -155,6 +155,18 @@ out: return p; } +static void safe_memcpy(void *dest, const void *src, size_t n) +{ +#ifdef USE_SLOW_MEMCPY + size_t i; + + for (i = 0; i < n; i++) + *((u8 *)dest + i) = *((const u8 *)src + i); +#else + memcpy(dest, src, n); +#endif +} + /* * Copy a physical memory chunk into a memory buffer. * This function allocates memory. @@ -214,7 +226,7 @@ void *mem_chunk(off_t base, size_t len, const char *devmem) if (mmp == MAP_FAILED) goto try_read; - memcpy(p, (u8 *)mmp + mmoffset, len); + safe_memcpy(p, (u8 *)mmp + mmoffset, len); if (munmap(mmp, mmoffset + len) == -1) {