Commit ae29bc92 authored by William Douglas's avatar William Douglas Committed by Linus Torvalds

printk: remove bounds checking for log_prefix

Currently log_prefix is testing that the first character of the log level
and facility is less than '0' and greater than '9' (which is always
false).

Since the code being updated works because strtoul bombs out (endp isn't
updated) and 0 is returned anyway just remove the check and don't change
the behavior of the function.
Signed-off-by: default avatarWilliam Douglas <william.douglas@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 48e41899
...@@ -595,9 +595,6 @@ static size_t log_prefix(const char *p, unsigned int *level, char *special) ...@@ -595,9 +595,6 @@ static size_t log_prefix(const char *p, unsigned int *level, char *special)
/* multi digit including the level and facility number */ /* multi digit including the level and facility number */
char *endp = NULL; char *endp = NULL;
if (p[1] < '0' || p[1] > '9')
return 0;
lev = (simple_strtoul(&p[1], &endp, 10) & 7); lev = (simple_strtoul(&p[1], &endp, 10) & 7);
if (endp == NULL || endp[0] != '>') if (endp == NULL || endp[0] != '>')
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment