2011-05-18 01:04:45

by Taylor Hutt

Subject: [PATCH] Max98095: Move existing NULL check before pointer dereference.

Visual inspection shows that max98095_put_eq_enum() and
max98095_put_bq_enum() each have a possible NULL deref of 'pdata'.

This change moves the NULL check above the use.

BUG=none
TEST=Visual inspection
Change-Id: Ic53a7e38a958f39225ac4961bcfd3812a95ea1b5
Signed-off-by: Taylor Hutt <[email protected]>
---
sound/soc/codecs/max98095.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index a6cc94e..e1d282d 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -1872,16 +1872,14 @@ static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,

BUG_ON(channel > 1);

- cdata = &max98095->dai[channel];
+ if (!pdata || !max98095->eq_textcnt)
+ return 0;

if (sel >= pdata->eq_cfgcnt)
return -EINVAL;

+ cdata = &max98095->dai[channel];
cdata->eq_sel = sel;
-
- if (!pdata || !max98095->eq_textcnt)
- return 0;
-
fs = cdata->rate;

/* Find the selected configuration with nearest sample rate */
@@ -2020,16 +2018,14 @@ static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol,

BUG_ON(channel > 1);

- cdata = &max98095->dai[channel];
+ if (!pdata || !max98095->bq_textcnt)
+ return 0;

if (sel >= pdata->bq_cfgcnt)
return -EINVAL;

+ cdata = &max98095->dai[channel];
cdata->bq_sel = sel;
-
- if (!pdata || !max98095->bq_textcnt)
- return 0;
-
fs = cdata->rate;

/* Find the selected configuration with nearest sample rate */
--
1.7.3.1

2011-05-18 01:44:42

by Peter Hsiang

Subject: RE: [PATCH] Max98095: Move existing NULL check before pointer dereference.

On Tue, May 17, 2011, Taylor Hutt wrote:

> Visual inspection shows that max98095_put_eq_enum() and
> max98095_put_bq_enum() each have a possible NULL deref of 'pdata'.
>
> This change moves the NULL check above the use.
>
> BUG=none
> TEST=Visual inspection

Mark, this patch looks good.
Thank you Taylor.

2011-05-18 07:06:26

by Mark Brown

Subject: Re: [PATCH] Max98095: Move existing NULL check before pointer dereference.

On Tue, May 17, 2011 at 06:28:04PM -0700, Peter Hsiang wrote:

> Mark, this patch looks good.

I can add your Acked-by?

2011-05-18 09:32:56

by Liam Girdwood

Subject: Re: [alsa-devel] [PATCH] Max98095: Move existing NULL check before pointer dereference.

On 18/05/11 02:28, Peter Hsiang wrote:
> On Tue, May 17, 2011, Taylor Hutt wrote:
>
>> Visual inspection shows that max98095_put_eq_enum() and
>> max98095_put_bq_enum() each have a possible NULL deref of 'pdata'.
>>
>> This change moves the NULL check above the use.
>>
>> BUG=none
>> TEST=Visual inspection
>
> Mark, this patch looks good.
> Thank you Taylor.
>

Acked-by: Liam Girdwood <[email protected]>

2011-05-18 13:55:24

by Peter Hsiang

Subject: RE: [PATCH] Max98095: Move existing NULL check before pointer dereference.

On Tue, May 17, 2011, Mark Brown wrote:

> On Tue, May 17, 2011 at 06:28:04PM -0700, Peter Hsiang wrote:
>
> > Mark, this patch looks good.
>
> I can add your Acked-by?

Ok thanks.

2011-05-18 16:38:19

by Mark Brown

Subject: Re: [PATCH] Max98095: Move existing NULL check before pointer dereference.

On Tue, May 17, 2011 at 06:03:54PM -0700, Taylor Hutt wrote:
> Visual inspection shows that max98095_put_eq_enum() and
> max98095_put_bq_enum() each have a possible NULL deref of 'pdata'.
>
> This change moves the NULL check above the use.

Applied, thanks. Please try to keep your subject line consistent with
the rest of the subsystem.