diff options
| author |   William Douglas <william.r.douglas@gmail.com> | 2011-10-31 17:11:31 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 17:30:53 -0700 |
| commit | ae29bc92da01a2e9d278a9a58c3b307d41cc0254 (patch) | |
| tree | 7709a1afd9f2089b3f9c13ed3086f5ef1fc5a088 | |
| parent | printk: fix bounds checking for log_prefix (diff) | |
| download | linux-dev-ae29bc92da01a2e9d278a9a58c3b307d41cc0254.tar.xz linux-dev-ae29bc92da01a2e9d278a9a58c3b307d41cc0254.zip | |
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>
| -rw-r--r-- | kernel/printk.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 286d2c7be52c..1455a0d4eedd 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -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; |