aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss <nicolas.iooss_linux@m4x.org>2016-08-25 15:17:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-26 17:39:35 -0700
commitae6c33ba6e37eea3012fe2640b22400ef3f2d0f3 (patch)
tree1b9b32d65ef7db7a0078f31a5f325bc108ba6dd2
parent804dd150468cfd920d92d4b3cf00536fedef3902 (diff)
downloadlinux-yocto-4.8-ae6c33ba6e37eea3012fe2640b22400ef3f2d0f3.tar.gz
linux-yocto-4.8-ae6c33ba6e37eea3012fe2640b22400ef3f2d0f3.tar.bz2
linux-yocto-4.8-ae6c33ba6e37eea3012fe2640b22400ef3f2d0f3.zip
printk: fix parsing of "brl=" option
Commit bbeddf52adc1 ("printk: move braille console support into separate braille.[ch] files") moved the parsing of braille-related options into _braille_console_setup(), changing the type of variable str from char* to char**. In this commit, memcmp(str, "brl,", 4) was correctly updated to memcmp(*str, "brl,", 4) but not memcmp(str, "brl=", 4). Update the code to make "brl=" option work again and replace memcmp() with strncmp() to make the compiler able to detect such an issue. Fixes: bbeddf52adc1 ("printk: move braille console support into separate braille.[ch] files") Link: http://lkml.kernel.org/r/20160823165700.28952-1-nicolas.iooss_linux@m4x.org Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/printk/braille.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c
index 276762f3a460..d5760c42f042 100644
--- a/kernel/printk/braille.c
+++ b/kernel/printk/braille.c
@@ -9,10 +9,10 @@
char *_braille_console_setup(char **str, char **brl_options)
{
- if (!memcmp(*str, "brl,", 4)) {
+ if (!strncmp(*str, "brl,", 4)) {
*brl_options = "";
*str += 4;
- } else if (!memcmp(str, "brl=", 4)) {
+ } else if (!strncmp(*str, "brl=", 4)) {
*brl_options = *str + 4;
*str = strchr(*brl_options, ',');
if (!*str)