Skip to contentSkip to conversation

kdb: use memmove instead of overlapping memcpy

PATCH In review Arnd Bergmann 2 participants 2 messages Feb 2, 2018 KGDB / KDB /debug_core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kdb: use memmove instead of overlapping memcpy

gcc discovered that the memcpy() arguments in kdbnearsym() overlap, so we should really use memmove(), which is defined to handle that correctly:

In function 'memcpy',
inlined from 'kdbnearsym' at /git/arm-soc/kernel/debug/kdb/kdb_support.c:132:4:
/git/arm-soc/include/linux/string.h:353:9: error: '__builtin_memcpy' accessing 792 bytes at offsets 0 and 8 overlaps 784 bytes at offset 8 [-Werror=restrict]
return __builtin_memcpy(p, q, size);

---
 kernel/debug/kdb/kdb_support.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/debug/kdb/kdb_support.c +2 -2
index 5d8ef3a07ecd..1ad4370ccbf0 100644
@@ -129,13 +129,13 @@ int kdbnearsym(unsigned long addr, kdb_symtab_t *symtab)
 		}
 		if (i >= ARRAY_SIZE(kdb_name_table)) {
 			debug_kfree(kdb_name_table[0]);
-			memcpy(kdb_name_table, kdb_name_table+1,
+			memmove(kdb_name_table, kdb_name_table+1,
 			       sizeof(kdb_name_table[0]) *
 			       (ARRAY_SIZE(kdb_name_table)-1));
 		} else {
 			debug_kfree(knt1);
 			knt1 = kdb_name_table[i];
-			memcpy(kdb_name_table+i, kdb_name_table+i+1,
+			memmove(kdb_name_table+i, kdb_name_table+i+1,
 			       sizeof(kdb_name_table[0]) *
 			       (ARRAY_SIZE(kdb_name_table)-i-1));
 		}
Signature · 1 line
2.9.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · Arnd Bergmann

gcc discovered that the memcpy() arguments in kdbnearsym() overlap, so we should really use memmove(), which is defined to handle that correctly:

In function 'memcpy',
inlined from 'kdbnearsym' at /git/arm-soc/kernel/debug/kdb/kdb_support.c:132:4:
/git/arm-soc/include/linux/string.h:353:9: error: '__builtin_memcpy' accessing 792 bytes at offsets 0 and 8 overlaps 784 bytes at offset 8 [-Werror=restrict]
return __builtin_memcpy(p, q, size);

---
  kernel/debug/kdb/kdb_support.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
kernel/debug/kdb/kdb_support.c +1 -1
index 5d8ef3a07ecd..1ad4370ccbf0 100644
@@ -129,13 +129,13 @@ int kdbnearsym(unsigned long addr, kdb_symtab_t *symtab)
  		}
  		if (i >= ARRAY_SIZE(kdb_name_table)) {
  			debug_kfree(kdb_name_table[0]);
-			memcpy(kdb_name_table, kdb_name_table+1,
+			memmove(kdb_name_table, kdb_name_table+1,

kernel/debug/kdb/kdb_support.c int kdbnearsym(unsigned long addr, kdb_symtab_t *symtab) · line 141

Quoted 10 lines
kernel/debug/kdb/kdb_support.c +1 -1
  			       sizeof(kdb_name_table[0]) *
  			       (ARRAY_SIZE(kdb_name_table)-1));
  		} else {
  			debug_kfree(knt1);
  			knt1 = kdb_name_table[i];
-			memcpy(kdb_name_table+i, kdb_name_table+i+1,
+			memmove(kdb_name_table+i, kdb_name_table+i+1,
  			       sizeof(kdb_name_table[0]) *
  			       (ARRAY_SIZE(kdb_name_table)-i-1));
  		}

That is good by me. Many thanks! Added to queue.

Jason.