Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1468668 > unrolled thread
| Started by | Nicolas Iooss <nicolas.iooss_linux@m4x.org> |
|---|---|
| First post | 2016-08-23 18:00 +0200 |
| Last post | 2016-08-23 18:50 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/1] printk: fix parsing of "brl=" option Nicolas Iooss <nicolas.iooss_linux@m4x.org> - 2016-08-23 18:00 +0200
Re: [PATCH 1/1] printk: fix parsing of "brl=" option Joe Perches <joe@perches.com> - 2016-08-23 18:30 +0200
Re: [PATCH 1/1] printk: fix parsing of "brl=" option Nicolas Iooss <nicolas.iooss_linux@m4x.org> - 2016-08-23 18:50 +0200
| From | Nicolas Iooss <nicolas.iooss_linux@m4x.org> |
|---|---|
| Date | 2016-08-23 18:00 +0200 |
| Subject | [PATCH 1/1] printk: fix parsing of "brl=" option |
| Message-ID | <s9mhj-5XZ-19@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Joe Perches <joe@perches.com> |
|---|---|
| Date | 2016-08-23 18:30 +0200 |
| Message-ID | <s9mKl-6om-19@gated-at.bofh.it> |
| In reply to | #1468668 |
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.
[toc] | [prev] | [next] | [standalone]
| From | Nicolas Iooss <nicolas.iooss_linux@m4x.org> |
|---|---|
| Date | 2016-08-23 18:50 +0200 |
| Message-ID | <s9n3I-6xg-21@gated-at.bofh.it> |
| In reply to | #1468685 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web