dyndbg: fix old BUG_ON in >control parser

jimc · gregkh · commit 00e7d3bea2ce · 2024-04-30T09:20:48.000+02:00
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>
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
@@ -302,7 +302,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 */

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,11 @@ static int ddebug_tokenize(char buf, char words[], int maxwords)`
`302`	`302`	`} else {`
`303`	`303`	`for (end = buf; end && !isspace(end); end++)`
`304`	`304`	`;`
`305`		`- BUG_ON(end == buf);`
	`305`	`+ if (end == buf) {`
	`306`	`+ pr_err("parse err after word:%d=%s\n", nwords,`
	`307`	`+ nwords ? words[nwords - 1] : "<none>");`
	`308`	`+ return -EINVAL;`
	`309`	`+ }`
`306`	`310`	`}`
`307`	`311`
`308`	`312`	/* `buf' is start of word, `end' is one past its end */