diff options
| author | Gabe Black <gabeblack@chromium.org> | 2013-07-01 04:28:23 -0700 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-07-15 18:53:37 +0200 |
| commit | c6b44162f5cccd72e9b4d9dbf071911249971846 (patch) | |
| tree | 37a648e4fb3c7c41efa4a5276578ca8d9c101698 | |
| parent | 630e4e8c7efa6306fb831cb1c9b6cabd53747a5a (diff) | |
CBFS: Use memmove instead of memcpy when loading a file from CBFS.
It might be the case that a file is being loaded from a portion of CBFS which
has already been loaded into a limitted bit of memory somewhere, and we want
to load that file in place, effectively, so that it's original location in
CBFS overlaps with its new location. That's only guaranteed to work if you use
memmove instead of memcpy.
Change-Id: Id550138c875907749fff05f330fcd2fb5f9ed924
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/3577
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/lib/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/lib/cbfs_core.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index f1783ba4b9..c42103810e 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -122,6 +122,9 @@ endif ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y) smm-y += memcpy.c endif +ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y) +smm-y += memmove.c +endif smm-y += cbfs.c memcmp.c smm-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c smm-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c index 852b37fcdf..39c1ff6008 100644 --- a/src/lib/cbfs_core.c +++ b/src/lib/cbfs_core.c @@ -195,7 +195,7 @@ int cbfs_decompress(int algo, void *src, void *dst, int len) { switch (algo) { case CBFS_COMPRESS_NONE: - memcpy(dst, src, len); + memmove(dst, src, len); return 0; #ifdef CBFS_CORE_WITH_LZMA case CBFS_COMPRESS_LZMA: |