Skip to content

Commit

Permalink
printk: remove bounds checking for log_prefix
Browse files Browse the repository at this point in the history
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: William Douglas <william.douglas@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
William Douglas authored and Linus Torvalds committed Nov 1, 2011
1 parent 48e4189 commit ae29bc9
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
char *endp = NULL;

if (p[1] < '0' || p[1] > '9')
return 0;

lev = (simple_strtoul(&p[1], &endp, 10) & 7);
if (endp == NULL || endp[0] != '>')
return 0;
Expand Down

0 comments on commit ae29bc9

Please sign in to comment.