media: go7007: fix a miss of snd_card_free
Subsystems (2)
PATCH v2 1/1 media: go7007: fix a miss of snd_card_free
go7007_snd_init() misses a snd_card_free() in an error path. Add the missed call to fix it.
Signed-off-by Chuhong Yuan <[email protected]>
---
Changes in v2:
- Use goto to simplify the code.
drivers/media/usb/go7007/snd-go7007.c | 35 +++++++++++++-------------- 1 file changed, 17 insertions(+), 18 deletions(-)
drivers/media/usb/go7007/snd-go7007.c +17 -18
@@ -236,22 +236,18 @@ int go7007_snd_init(struct go7007 *go) gosnd->capturing =0 ; ret =snd_card_new (go->dev, index[dev], id[dev],THIS_MODULE ,0 , &gosnd->card); -if (ret <0 ) { -kfree (gosnd); -return ret; - } +if (ret <0 ) + goto free_snd; + ret =snd_device_new (gosnd->card,SNDRV_DEV_LOWLEVEL , go, &go7007_snd_device_ops); -if (ret <0 ) { -kfree (gosnd); -return ret; - } +if (ret <0 ) + goto free_card; + ret =snd_pcm_new (gosnd->card,"go7007" ,0 ,0 ,1 , &gosnd->pcm); -if (ret <0 ) { -snd_card_free (gosnd->card); -kfree (gosnd); -return ret; - } +if (ret <0 ) + goto free_card; +strscpy (gosnd->card->driver,"go7007" ,sizeof (gosnd->card->driver));strscpy (gosnd->card->shortname, go->name,sizeof (gosnd->card->shortname)); strscpy(gosnd->card->longname, gosnd->card->shortname,
@@ -262,11 +258,8 @@ int go7007_snd_init(struct go7007 *go) &go7007_snd_capture_ops); ret =snd_card_register (gosnd->card); -if (ret <0 ) { -snd_card_free (gosnd->card); -kfree (gosnd); -return ret; - } +if (ret <0 ) + goto free_card; gosnd->substream =NULL ; go->snd_context = gosnd;
@@ -274,6 +267,12 @@ int go7007_snd_init(struct go7007 *go) ++dev;return 0 ; + +free_card: +snd_card_free (gosnd->card); +free_snd: +kfree (gosnd); +return ret; }EXPORT_SYMBOL (go7007_snd_init);
Signature · 1 line
2.24.0
Quoted 2 lines
go7007_snd_init()misses asnd_card_free()in an error path. Add the missed call to fix it.
Can the tag “Reported-by” be appropriate according to a review comment from 2017-09-19?
https://lkml.org/lkml/2017/9/19/115
https://lore.kernel.org/patchwork/comment/1026462/
Quoted 2 lines
Changes in v2:
- Use goto to simplify the code.
Thanks for your improvement of the exception handling.
Regards,
Markus