2018-06-11 08:05:13

by Zhouyang Jia

Subject: [PATCH] ALSA: fm801: add error handling for snd_ctl_add

When snd_ctl_add fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling snd_ctl_add.

Signed-off-by: Zhouyang Jia <[email protected]>
---
sound/pci/fm801.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 73a67bc..e3fb9c6 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip)
if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_sec)) < 0)
return err;
}
- for (i = 0; i < FM801_CONTROLS; i++)
- snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls[i], chip));
+ for (i = 0; i < FM801_CONTROLS; i++) {
+ err = snd_ctl_add(chip->card,
+ snd_ctl_new1(&snd_fm801_controls[i], chip));
+ if (err < 0)
+ return err;
+ }
if (chip->multichannel) {
- for (i = 0; i < FM801_CONTROLS_MULTI; i++)
- snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls_multi[i], chip));
+ for (i = 0; i < FM801_CONTROLS_MULTI; i++) {
+ err = snd_ctl_add(chip->card,
+ snd_ctl_new1(&snd_fm801_controls_multi[i], chip));
+ if (err < 0)
+ return err;
+ }
}
return 0;
}
--
2.7.4

2018-06-11 08:50:39

by Andy Shevchenko

Subject: Re: [PATCH] ALSA: fm801: add error handling for snd_ctl_add

On Mon, 2018-06-11 at 16:04 +0800, [email protected] wrote:
> When snd_ctl_add fails, the lack of error-handling code may
> cause unexpected results.
>
> This patch adds error-handling code after calling snd_ctl_add.
>

Acked-by: Andy Shevchenko <[email protected]>

Though I can't test this (I have FM-only card). Last person who would
able to test was Émeric (Cc'ed).

> Signed-off-by: Zhouyang Jia <[email protected]>
> ---
> sound/pci/fm801.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
> index 73a67bc..e3fb9c6 100644
> --- a/sound/pci/fm801.c
> +++ b/sound/pci/fm801.c
> @@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip)
> if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97,
> &chip->ac97_sec)) < 0)
> return err;
> }
> - for (i = 0; i < FM801_CONTROLS; i++)
> - snd_ctl_add(chip->card,
> snd_ctl_new1(&snd_fm801_controls[i], chip));
> + for (i = 0; i < FM801_CONTROLS; i++) {
> + err = snd_ctl_add(chip->card,
> + snd_ctl_new1(&snd_fm801_controls[i], chip));
> + if (err < 0)
> + return err;
> + }
> if (chip->multichannel) {
> - for (i = 0; i < FM801_CONTROLS_MULTI; i++)
> - snd_ctl_add(chip->card,
> snd_ctl_new1(&snd_fm801_controls_multi[i], chip));
> + for (i = 0; i < FM801_CONTROLS_MULTI; i++) {
> + err = snd_ctl_add(chip->card,
> + snd_ctl_new1(&snd_fm801_controls_mult
> i[i], chip));
> + if (err < 0)
> + return err;
> + }
> }
> return 0;
> }

--
Andy Shevchenko <[email protected]>
Intel Finland Oy

2018-06-11 13:25:25

by Takashi Iwai

Subject: Re: [PATCH] ALSA: fm801: add error handling for snd_ctl_add

On Mon, 11 Jun 2018 10:49:56 +0200,
Andy Shevchenko wrote:
>
> On Mon, 2018-06-11 at 16:04 +0800, [email protected] wrote:
> > When snd_ctl_add fails, the lack of error-handling code may
> > cause unexpected results.
> >
> > This patch adds error-handling code after calling snd_ctl_add.
> >
>
> Acked-by: Andy Shevchenko <[email protected]>
>
> Though I can't test this (I have FM-only card). Last person who would
> able to test was Émeric (Cc'ed).

I applied now as this change is pretty safe.


thanks,

Takashi

>
> > Signed-off-by: Zhouyang Jia <[email protected]>
> > ---
> > sound/pci/fm801.c | 16 ++++++++++++----
> > 1 file changed, 12 insertions(+), 4 deletions(-)
> >
> > diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
> > index 73a67bc..e3fb9c6 100644
> > --- a/sound/pci/fm801.c
> > +++ b/sound/pci/fm801.c
> > @@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip)
> > if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97,
> > &chip->ac97_sec)) < 0)
> > return err;
> > }
> > - for (i = 0; i < FM801_CONTROLS; i++)
> > - snd_ctl_add(chip->card,
> > snd_ctl_new1(&snd_fm801_controls[i], chip));
> > + for (i = 0; i < FM801_CONTROLS; i++) {
> > + err = snd_ctl_add(chip->card,
> > + snd_ctl_new1(&snd_fm801_controls[i], chip));
> > + if (err < 0)
> > + return err;
> > + }
> > if (chip->multichannel) {
> > - for (i = 0; i < FM801_CONTROLS_MULTI; i++)
> > - snd_ctl_add(chip->card,
> > snd_ctl_new1(&snd_fm801_controls_multi[i], chip));
> > + for (i = 0; i < FM801_CONTROLS_MULTI; i++) {
> > + err = snd_ctl_add(chip->card,
> > + snd_ctl_new1(&snd_fm801_controls_mult
> > i[i], chip));
> > + if (err < 0)
> > + return err;
> > + }
> > }
> > return 0;
> > }
>
> --
> Andy Shevchenko <[email protected]>
> Intel Finland Oy
>

2018-06-20 19:40:13

by Émeric MASCHINO

Subject: Re: [PATCH] ALSA: fm801: add error handling for snd_ctl_add

Patch tested on my ia64 workstation. Works flawlessly.

Thanks,

Émeric


2018-06-11 15:24 GMT+02:00 Takashi Iwai <[email protected]>:
> On Mon, 11 Jun 2018 10:49:56 +0200,
> Andy Shevchenko wrote:
>>
>> On Mon, 2018-06-11 at 16:04 +0800, [email protected] wrote:
>> > When snd_ctl_add fails, the lack of error-handling code may
>> > cause unexpected results.
>> >
>> > This patch adds error-handling code after calling snd_ctl_add.
>> >
>>
>> Acked-by: Andy Shevchenko <[email protected]>
>>
>> Though I can't test this (I have FM-only card). Last person who would
>> able to test was Émeric (Cc'ed).
>
> I applied now as this change is pretty safe.
>
>
> thanks,
>
> Takashi
>
>>
>> > Signed-off-by: Zhouyang Jia <[email protected]>
>> > ---
>> > sound/pci/fm801.c | 16 ++++++++++++----
>> > 1 file changed, 12 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
>> > index 73a67bc..e3fb9c6 100644
>> > --- a/sound/pci/fm801.c
>> > +++ b/sound/pci/fm801.c
>> > @@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip)
>> > if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97,
>> > &chip->ac97_sec)) < 0)
>> > return err;
>> > }
>> > - for (i = 0; i < FM801_CONTROLS; i++)
>> > - snd_ctl_add(chip->card,
>> > snd_ctl_new1(&snd_fm801_controls[i], chip));
>> > + for (i = 0; i < FM801_CONTROLS; i++) {
>> > + err = snd_ctl_add(chip->card,
>> > + snd_ctl_new1(&snd_fm801_controls[i], chip));
>> > + if (err < 0)
>> > + return err;
>> > + }
>> > if (chip->multichannel) {
>> > - for (i = 0; i < FM801_CONTROLS_MULTI; i++)
>> > - snd_ctl_add(chip->card,
>> > snd_ctl_new1(&snd_fm801_controls_multi[i], chip));
>> > + for (i = 0; i < FM801_CONTROLS_MULTI; i++) {
>> > + err = snd_ctl_add(chip->card,
>> > + snd_ctl_new1(&snd_fm801_controls_mult
>> > i[i], chip));
>> > + if (err < 0)
>> > + return err;
>> > + }
>> > }
>> > return 0;
>> > }
>>
>> --
>> Andy Shevchenko <[email protected]>
>> Intel Finland Oy
>>

2018-06-21 00:35:06

by Andy Shevchenko

Subject: Re: [PATCH] ALSA: fm801: add error handling for snd_ctl_add

On Wed, Jun 20, 2018 at 10:39 PM, Émeric MASCHINO
<[email protected]> wrote:
> Patch tested on my ia64 workstation. Works flawlessly.
>

Thanks, Émeric!

--
With Best Regards,
Andy Shevchenko