* [PATCH] greybus: audio: ensure module is set to avoid crash on dev_err message
@ 2016-09-23 10:25 Colin King
2016-09-23 16:58 ` Greg Kroah-Hartman
0 siblings, 1 reply; 4+ messages in thread
From: Colin King @ 2016-09-23 10:25 UTC (permalink / raw)
To: Vaibhav Agarwal, Johan Hovold, Alex Elder, Greg Kroah-Hartman, devel
Cc: linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently, if info is null, the dev_err message is dereferencing an
uninitialized module pointer. Instead, initialize module before the
dev_err call to fix this issue.
Found using static analysis with cppcheck:
[drivers/staging/greybus/audio_topology.c:175]: (error)
Uninitialized variable: module
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/staging/greybus/audio_topology.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
index 5eef536..c43a959 100644
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -171,6 +171,9 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
data = (struct gbaudio_ctl_pvt *)kcontrol->private_value;
info = (struct gb_audio_ctl_elem_info *)data->info;
+ module = find_gb_module(gbcodec, kcontrol->id.name);
+ if (!module)
+ return -EINVAL;
if (!info) {
dev_err(module->dev, "NULL info for %s\n", uinfo->id.name);
return -EINVAL;
@@ -192,9 +195,6 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
uinfo->value.enumerated.items = max;
if (uinfo->value.enumerated.item > max - 1)
uinfo->value.enumerated.item = max - 1;
- module = find_gb_module(gbcodec, kcontrol->id.name);
- if (!module)
- return -EINVAL;
name = gbaudio_map_controlid(module, data->ctl_id,
uinfo->value.enumerated.item);
strlcpy(uinfo->value.enumerated.name, name, NAME_SIZE);
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] greybus: audio: ensure module is set to avoid crash on dev_err message
2016-09-23 10:25 [PATCH] greybus: audio: ensure module is set to avoid crash on dev_err message Colin King
@ 2016-09-23 16:58 ` Greg Kroah-Hartman
2016-09-23 18:20 ` Vaibhav Agarwal
0 siblings, 1 reply; 4+ messages in thread
From: Greg Kroah-Hartman @ 2016-09-23 16:58 UTC (permalink / raw)
To: Colin King; +Cc: Vaibhav Agarwal, Johan Hovold, Alex Elder, devel, linux-kernel
On Fri, Sep 23, 2016 at 11:25:40AM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently, if info is null, the dev_err message is dereferencing an
> uninitialized module pointer. Instead, initialize module before the
> dev_err call to fix this issue.
>
> Found using static analysis with cppcheck:
> [drivers/staging/greybus/audio_topology.c:175]: (error)
> Uninitialized variable: module
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/staging/greybus/audio_topology.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
> index 5eef536..c43a959 100644
> --- a/drivers/staging/greybus/audio_topology.c
> +++ b/drivers/staging/greybus/audio_topology.c
> @@ -171,6 +171,9 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
> data = (struct gbaudio_ctl_pvt *)kcontrol->private_value;
> info = (struct gb_audio_ctl_elem_info *)data->info;
>
> + module = find_gb_module(gbcodec, kcontrol->id.name);
> + if (!module)
> + return -EINVAL;
How do you know you can get a module at this point in time, you haven't
looked at the type of info to know that?
I agree that there is an issue here, but I don't think this is the
correct fix. Vaibhav?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] greybus: audio: ensure module is set to avoid crash on dev_err message
2016-09-23 16:58 ` Greg Kroah-Hartman
@ 2016-09-23 18:20 ` Vaibhav Agarwal
2016-09-23 18:29 ` Colin Ian King
0 siblings, 1 reply; 4+ messages in thread
From: Vaibhav Agarwal @ 2016-09-23 18:20 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Colin King, Johan Hovold, Alex Elder, devel, linux-kernel
On Fri, Sep 23, 2016 at 10:28 PM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Fri, Sep 23, 2016 at 11:25:40AM +0100, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Currently, if info is null, the dev_err message is dereferencing an
>> uninitialized module pointer. Instead, initialize module before the
>> dev_err call to fix this issue.
>>
>> Found using static analysis with cppcheck:
>> [drivers/staging/greybus/audio_topology.c:175]: (error)
>> Uninitialized variable: module
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>> drivers/staging/greybus/audio_topology.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
>> index 5eef536..c43a959 100644
>> --- a/drivers/staging/greybus/audio_topology.c
>> +++ b/drivers/staging/greybus/audio_topology.c
>> @@ -171,6 +171,9 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
>> data = (struct gbaudio_ctl_pvt *)kcontrol->private_value;
>> info = (struct gb_audio_ctl_elem_info *)data->info;
>>
>> + module = find_gb_module(gbcodec, kcontrol->id.name);
>> + if (!module)
>> + return -EINVAL;
>
> How do you know you can get a module at this point in time, you haven't
> looked at the type of info to know that?
>
> I agree that there is an issue here, but I don't think this is the
> correct fix. Vaibhav?
Actually, fetching module is not related to info->type. However it is
only required in case of ENUMERATED element_type, thus used in
specific case. Also, I think it's better to use codec->dev in the err
message and align with other err_msg in this function.
Hi Colin, thanks for sharing this patch. Do you mind updating this
patch including my above suggestion? Otherwise, I can share a separate
patch.
--
thanks,
vaibhav
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] greybus: audio: ensure module is set to avoid crash on dev_err message
2016-09-23 18:20 ` Vaibhav Agarwal
@ 2016-09-23 18:29 ` Colin Ian King
0 siblings, 0 replies; 4+ messages in thread
From: Colin Ian King @ 2016-09-23 18:29 UTC (permalink / raw)
To: Vaibhav Agarwal, Greg Kroah-Hartman
Cc: Johan Hovold, Alex Elder, devel, linux-kernel
On 23/09/16 19:20, Vaibhav Agarwal wrote:
> On Fri, Sep 23, 2016 at 10:28 PM, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
>> On Fri, Sep 23, 2016 at 11:25:40AM +0100, Colin King wrote:
>>> From: Colin Ian King <colin.king@canonical.com>
>>>
>>> Currently, if info is null, the dev_err message is dereferencing an
>>> uninitialized module pointer. Instead, initialize module before the
>>> dev_err call to fix this issue.
>>>
>>> Found using static analysis with cppcheck:
>>> [drivers/staging/greybus/audio_topology.c:175]: (error)
>>> Uninitialized variable: module
>>>
>>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>>> ---
>>> drivers/staging/greybus/audio_topology.c | 6 +++---
>>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
>>> index 5eef536..c43a959 100644
>>> --- a/drivers/staging/greybus/audio_topology.c
>>> +++ b/drivers/staging/greybus/audio_topology.c
>>> @@ -171,6 +171,9 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
>>> data = (struct gbaudio_ctl_pvt *)kcontrol->private_value;
>>> info = (struct gb_audio_ctl_elem_info *)data->info;
>>>
>>> + module = find_gb_module(gbcodec, kcontrol->id.name);
>>> + if (!module)
>>> + return -EINVAL;
>>
>> How do you know you can get a module at this point in time, you haven't
>> looked at the type of info to know that?
>>
>> I agree that there is an issue here, but I don't think this is the
>> correct fix. Vaibhav?
>
> Actually, fetching module is not related to info->type. However it is
> only required in case of ENUMERATED element_type, thus used in
> specific case. Also, I think it's better to use codec->dev in the err
> message and align with other err_msg in this function.
>
> Hi Colin, thanks for sharing this patch. Do you mind updating this
> patch including my above suggestion? Otherwise, I can share a separate
> patch.
Vaibhav, I'm currently traveling, so won't be able to check this until
next week, so if you would rather send a correct fix sooner rather me
re-sending a fix then I'm fine with that.
Thanks, Colin
>
> --
> thanks,
> vaibhav
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-23 18:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-23 10:25 [PATCH] greybus: audio: ensure module is set to avoid crash on dev_err message Colin King
2016-09-23 16:58 ` Greg Kroah-Hartman
2016-09-23 18:20 ` Vaibhav Agarwal
2016-09-23 18:29 ` Colin Ian King
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.