summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Cromie <jim.cromie@gmail.com>2024-04-29 22:31:11 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-05-17 12:42:43 +0300
commit3c718bddddca9cbef177ac475b94c5c91147fb38 (patch)
tree2010836284e125f27a18beefc0bb60c8c1971888
parente19ec8ab0e25bc4803d7cc91c84e84532e2781bd (diff)
downloadlinux-3c718bddddca9cbef177ac475b94c5c91147fb38.tar.xz
dyndbg: fix old BUG_ON in >control parser
commit 00e7d3bea2ce7dac7bee1cf501fb071fd0ea8f6c upstream. Fix a BUG_ON from 2009. Even if it looks "unreachable" (I didn't really look), lets make sure by removing it, doing pr_err and return -EINVAL instead. Cc: stable <stable@kernel.org> Signed-off-by: Jim Cromie <jim.cromie@gmail.com> Link: https://lore.kernel.org/r/20240429193145.66543-2-jim.cromie@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--lib/dynamic_debug.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index d56a78beb279..8c00cc57bfc3 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -242,7 +242,11 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
} else {
for (end = buf; *end && !isspace(*end); end++)
;
- BUG_ON(end == buf);
+ if (end == buf) {
+ pr_err("parse err after word:%d=%s\n", nwords,
+ nwords ? words[nwords - 1] : "<none>");
+ return -EINVAL;
+ }
}
/* `buf' is start of word, `end' is one past its end */