* [PATCH 1/1] printk: fix parsing of "brl=" option
@ 2016-08-23 15:47 Nicolas Iooss
2016-08-23 16:25 ` Joe Perches
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Iooss @ 2016-08-23 15:47 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Nicolas Iooss
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.
Fixes: bbeddf52adc1 ("printk: move braille console support into separate
braille.[ch] files")
Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
---
kernel/printk/braille.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c
index 276762f3a460..f735ade8494c 100644
--- a/kernel/printk/braille.c
+++ b/kernel/printk/braille.c
@@ -12,7 +12,7 @@ char *_braille_console_setup(char **str, char **brl_options)
if (!memcmp(*str, "brl,", 4)) {
*brl_options = "";
*str += 4;
- } else if (!memcmp(str, "brl=", 4)) {
+ } else if (!memcmp(*str, "brl=", 4)) {
*brl_options = *str + 4;
*str = strchr(*brl_options, ',');
if (!*str)
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] printk: fix parsing of "brl=" option
2016-08-23 15:47 [PATCH 1/1] printk: fix parsing of "brl=" option Nicolas Iooss
@ 2016-08-23 16:25 ` Joe Perches
2016-08-23 16:46 ` Nicolas Iooss
0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2016-08-23 16:25 UTC (permalink / raw)
To: Nicolas Iooss, Andrew Morton; +Cc: linux-kernel
On Tue, 2016-08-23 at 17:47 +0200, Nicolas Iooss wrote:
> 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.
>
> Fixes: bbeddf52adc1 ("printk: move braille console support into separate
> braille.[ch] files")
> Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
> ---
> kernel/printk/braille.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c
> index 276762f3a460..f735ade8494c 100644
> --- a/kernel/printk/braille.c
> +++ b/kernel/printk/braille.c
> @@ -12,7 +12,7 @@ char *_braille_console_setup(char **str, char **brl_options)
> if (!memcmp(*str, "brl,", 4)) {
> *brl_options = "";
> *str += 4;
> - } else if (!memcmp(str, "brl=", 4)) {
> + } else if (!memcmp(*str, "brl=", 4)) {
> *brl_options = *str + 4;
> *str = strchr(*brl_options, ',');
> if (!*str)
Thanks.
likely the first memcmp here should be strcmp
and the second should be strncmp
That would have caused the compiler to show
the defect.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] printk: fix parsing of "brl=" option
2016-08-23 16:25 ` Joe Perches
@ 2016-08-23 16:46 ` Nicolas Iooss
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Iooss @ 2016-08-23 16:46 UTC (permalink / raw)
To: Joe Perches, Andrew Morton; +Cc: linux-kernel
On 23/08/16 18:25, Joe Perches wrote:
> On Tue, 2016-08-23 at 17:47 +0200, Nicolas Iooss wrote:
>> 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.
>>
>> Fixes: bbeddf52adc1 ("printk: move braille console support into separate
>> braille.[ch] files")
>> Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
>> ---
>> kernel/printk/braille.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c
>> index 276762f3a460..f735ade8494c 100644
>> --- a/kernel/printk/braille.c
>> +++ b/kernel/printk/braille.c
>> @@ -12,7 +12,7 @@ char *_braille_console_setup(char **str, char **brl_options)
>> if (!memcmp(*str, "brl,", 4)) {
>> *brl_options = "";
>> *str += 4;
>> - } else if (!memcmp(str, "brl=", 4)) {
>> + } else if (!memcmp(*str, "brl=", 4)) {
>> *brl_options = *str + 4;
>> *str = strchr(*brl_options, ',');
>> if (!*str)
>
> Thanks.
>
> likely the first memcmp here should be strcmp
> and the second should be strncmp
>
> That would have caused the compiler to show
> the defect.
The first memcmp should also be a strncmp (there is a comma after brl).
Anyway I agree with your proposition and will send a v2 with strncmp.
Nicolas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-23 16:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-23 15:47 [PATCH 1/1] printk: fix parsing of "brl=" option Nicolas Iooss
2016-08-23 16:25 ` Joe Perches
2016-08-23 16:46 ` Nicolas Iooss
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox