kdb: Replace deprecated strcpy() with memmove() in vkdb_printf()
PATCH v2 1/1 kdb: Replace deprecated strcpy() with memmove() in vkdb_printf()
strcpy() is deprecated and its behavior is undefined when the source and destination buffers overlap. Use memmove() instead to avoid any undefined behavior.
Adjust comments for clarity.
---
Changes in v2:
- Use memmove() because of strcpy()'s undefined behavior with
overlapping buffers as suggested by Doug Anderson
- Compile-tested only
- Link to v1: https://lore.kernel.org/lkml/[email protected]/
--- kernel/debug/kdb/kdb_io.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
kernel/debug/kdb/kdb_io.c +8 -6
@@ -714,8 +714,8 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)* it, depending on the results of the search. */ cp++;/* to byte after the newline */ - replaced_byte = *cp;/* remember what/where it was */ - cphold = cp; + replaced_byte = *cp;/* remember what it was */ + cphold = cp;/* remember where it was */ *cp ='\0' ;/* end the string for our search */ /*
@@ -732,8 +732,9 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)* Shift the buffer left. */ *cphold = replaced_byte; -strcpy (kdb_buffer, cphold); - len =strlen (kdb_buffer); + len =strlen (cphold); +/* Use memmove() because the buffers overlap */ +memmove (kdb_buffer, cphold, len +1 ); next_avail = kdb_buffer + len; size_avail =sizeof (kdb_buffer) - len; goto kdb_print_out;
@@ -872,8 +873,9 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)*/ if (kdb_grepping_flag && !suspend_grep) { *cphold = replaced_byte; -strcpy (kdb_buffer, cphold); - len =strlen (kdb_buffer); + len =strlen (cphold); +/* Use memmove() because the buffers overlap */ +memmove (kdb_buffer, cphold, len +1 ); next_avail = kdb_buffer + len; size_avail =sizeof (kdb_buffer) - len; }
Signature · 1 line
2.50.1
Hi,
Quoted 15 lines · Thorsten Blum
strcpy()is deprecated and its behavior is undefined when the source and destination buffers overlap. Usememmove()instead to avoid any undefined behavior.Adjust comments for clarity.
Signed-off-by Thorsten Blum <[email protected]>---
Changes in v2:
- Usememmove()because of strcpy()'s undefined behavior with
overlapping buffers as suggested by Doug Anderson
- Compile-tested only
- Link to v1: https://lore.kernel.org/lkml/[email protected]/
Quoted 3 lines
--- kernel/debug/kdb/kdb_io.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
Much nicer, thank you!
Given that the old code was officially relying on undefined behavior of strcpy() before, I'd personally even add:
In any case:
Quoted 24 lines · Doug Anderson
Hi,
Quoted 15 lines · Thorsten Blum
strcpy()is deprecated and its behavior is undefined when the source and destination buffers overlap. Usememmove()instead to avoid any undefined behavior.Adjust comments for clarity.
Signed-off-by Thorsten Blum <[email protected]>---
Changes in v2:
- Usememmove()because of strcpy()'s undefined behavior with
overlapping buffers as suggested by Doug Anderson
- Compile-tested only
- Link to v1: https://lore.kernel.org/lkml/[email protected]/Quoted 3 lines
--- kernel/debug/kdb/kdb_io.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)Much nicer, thank you!
Quoted 8 lines
Given that the old code was officially relying on undefined behavior of
strcpy()before, I'd personally even add:Fixes 5d5314d6795f ("kdb: core for kgdb back end (1 of 2)")In any case:
Reviewed-by Douglas Anderson <[email protected]>
LGTM... and I agree that this is bug rather than a clean up so am waiting to hear back on the Fixes: .
Daniel
PS Feel free to roll all three kdb patches discussed recently into a
series so I can pull in one go ;-) .
Quoted 27 lines · Daniel Thompson
Quoted 26 lines · Doug Anderson
Quoted 17 lines · Thorsten Blum
strcpy()is deprecated and its behavior is undefined when the source and destination buffers overlap. Usememmove()instead to avoid any undefined behavior.Adjust comments for clarity.
Signed-off-by Thorsten Blum <[email protected]>---
Changes in v2:
- Usememmove()because of strcpy()'s undefined behavior with
overlapping buffers as suggested by Doug Anderson
- Compile-tested only
- Link to v1: https://lore.kernel.org/lkml/[email protected]/
---kernel/debug/kdb/kdb_io.c| 14 ++++++++------Quoted 1 line
1 file changed, 8 insertions(+), 6 deletions(-)Much nicer, thank you!
Given that the old code was officially relying on undefined behavior of
strcpy()before, I'd personally even add:
Quoted 8 lines
Quoted 5 lines
Fixes 5d5314d6795f ("kdb: core for kgdb back end (1 of 2)")In any case:
Reviewed-by Douglas Anderson <[email protected]>LGTM... and I agree that this is bug rather than a clean up so am waiting to hear back on the Fixes: .
Yes, the Fixes: tag is fine, of course. Thanks!
How about backporting this to stable?
Best,
Thorsten