aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-01-18 17:53:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2024-01-18 17:53:22 -0800
commit2a668d217676c642bec02ee3b5b73a623f194f7a (patch)
treead0cbbd0c764b8bf0364a94605838380ec9b7ba6
parent736b5545d39ca59d4332a60e56cc8a1a5e264a8e (diff)
parent4f41d30cd6dc865c3cbc1a852372321eba6d4e4c (diff)
downloadcrypto-2.6-2a668d217676c642bec02ee3b5b73a623f194f7a.tar.gz
Merge tag 'kgdb-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux
Pull kgdb update from Daniel Thompson: "The entire changeset for kgdb this cycle is a single two-line change to remove some deadcode that, had it not been dead, would have called strncpy() in an unsafe manner. To be fair there were other modest clean ups were discussed this cycle but they are not finalized and will have to wait until next time" * tag 'kgdb-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux: kdb: Fix a potential buffer overflow in kdb_local()
-rw-r--r--kernel/debug/kdb/kdb_main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 6b213c8252d62d..d05066cb40b2ee 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -1348,8 +1348,6 @@ do_full_getstr:
/* PROMPT can only be set if we have MEM_READ permission. */
snprintf(kdb_prompt_str, CMD_BUFLEN, kdbgetenv("PROMPT"),
raw_smp_processor_id());
- if (defcmd_in_progress)
- strncat(kdb_prompt_str, "[defcmd]", CMD_BUFLEN);
/*
* Fetch command from keyboard