Commit ae29bc92 authored Oct 31, 2011 by William Douglas Committed by Linus Torvalds Oct 31, 2011

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: William Douglas <william.douglas@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 48e41899

kernel/printk.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message