Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1717617 > unrolled thread
| Started by | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| First post | 2017-08-22 19:50 +0200 |
| Last post | 2017-08-22 22:20 +0200 |
| Articles | 6 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 19:50 +0200
Re: [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() Takashi Iwai <tiwai@suse.de> - 2017-08-22 20:00 +0200
Re: [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() Dan Carpenter <dan.carpenter@oracle.com> - 2017-08-22 21:20 +0200
Re: [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 22:10 +0200
Re: [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() Dan Carpenter <dan.carpenter@oracle.com> - 2017-08-22 22:20 +0200
Re: [alsa-devel] [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() Takashi Iwai <tiwai@suse.de> - 2017-08-22 22:20 +0200
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2017-08-22 19:50 +0200 |
| Subject | [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() |
| Message-ID | <uhltn-5B5-3@gated-at.bofh.it> |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 22 Aug 2017 19:37:26 +0200
Add jump targets so that a bit of exception handling can be better reused
at the end of this function.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
sound/pci/via82xx_modem.c | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 55f79b2599e7..8659776887b2 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -1110,8 +1110,8 @@ static int snd_via82xx_create(struct snd_card *card,
return err;
if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) {
- pci_disable_device(pci);
- return -ENOMEM;
+ err = -ENOMEM;
+ goto disable_device;
}
spin_lock_init(&chip->reg_lock);
@@ -1121,30 +1121,27 @@ static int snd_via82xx_create(struct snd_card *card,
if ((err = pci_request_regions(pci, card->driver)) < 0) {
kfree(chip);
- pci_disable_device(pci);
- return err;
+ goto disable_device;
}
chip->port = pci_resource_start(pci, 0);
if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED,
KBUILD_MODNAME, chip)) {
dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
- snd_via82xx_free(chip);
- return -EBUSY;
+ err = -EBUSY;
+ goto free_chip;
}
chip->irq = pci->irq;
if (ac97_clock >= 8000 && ac97_clock <= 48000)
chip->ac97_clock = ac97_clock;
synchronize_irq(chip->irq);
- if ((err = snd_via82xx_chip_init(chip)) < 0) {
- snd_via82xx_free(chip);
- return err;
- }
+ err = snd_via82xx_chip_init(chip);
+ if (err < 0)
+ goto free_chip;
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
- snd_via82xx_free(chip);
- return err;
- }
+ err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+ if (err < 0)
+ goto free_chip;
/* The 8233 ac97 controller does not implement the master bit
* in the pci command register. IMHO this is a violation of the PCI spec.
@@ -1153,6 +1150,14 @@ static int snd_via82xx_create(struct snd_card *card,
*r_via = chip;
return 0;
+
+disable_device:
+ pci_disable_device(pci);
+ goto exit;
+free_chip:
+ snd_via82xx_free(chip);
+exit:
+ return err;
}
--
2.14.0
[toc] | [next] | [standalone]
| From | Takashi Iwai <tiwai@suse.de> |
|---|---|
| Date | 2017-08-22 20:00 +0200 |
| Subject | Re: [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() |
| Message-ID | <uhlD3-5Gr-7@gated-at.bofh.it> |
| In reply to | #1717617 |
On Tue, 22 Aug 2017 19:43:08 +0200,
SF Markus Elfring wrote:
>
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 22 Aug 2017 19:37:26 +0200
>
> Add jump targets so that a bit of exception handling can be better reused
> at the end of this function.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> sound/pci/via82xx_modem.c | 33 +++++++++++++++++++--------------
> 1 file changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
> index 55f79b2599e7..8659776887b2 100644
> --- a/sound/pci/via82xx_modem.c
> +++ b/sound/pci/via82xx_modem.c
> @@ -1110,8 +1110,8 @@ static int snd_via82xx_create(struct snd_card *card,
> return err;
>
> if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) {
> - pci_disable_device(pci);
> - return -ENOMEM;
> + err = -ENOMEM;
> + goto disable_device;
> }
>
> spin_lock_init(&chip->reg_lock);
> @@ -1121,30 +1121,27 @@ static int snd_via82xx_create(struct snd_card *card,
>
> if ((err = pci_request_regions(pci, card->driver)) < 0) {
> kfree(chip);
> - pci_disable_device(pci);
> - return err;
> + goto disable_device;
> }
> chip->port = pci_resource_start(pci, 0);
> if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED,
> KBUILD_MODNAME, chip)) {
> dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
> - snd_via82xx_free(chip);
> - return -EBUSY;
> + err = -EBUSY;
> + goto free_chip;
> }
> chip->irq = pci->irq;
> if (ac97_clock >= 8000 && ac97_clock <= 48000)
> chip->ac97_clock = ac97_clock;
> synchronize_irq(chip->irq);
>
> - if ((err = snd_via82xx_chip_init(chip)) < 0) {
> - snd_via82xx_free(chip);
> - return err;
> - }
> + err = snd_via82xx_chip_init(chip);
> + if (err < 0)
> + goto free_chip;
>
> - if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
> - snd_via82xx_free(chip);
> - return err;
> - }
> + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
> + if (err < 0)
> + goto free_chip;
>
> /* The 8233 ac97 controller does not implement the master bit
> * in the pci command register. IMHO this is a violation of the PCI spec.
> @@ -1153,6 +1150,14 @@ static int snd_via82xx_create(struct snd_card *card,
>
> *r_via = chip;
> return 0;
> +
> +disable_device:
> + pci_disable_device(pci);
> + goto exit;
> +free_chip:
> + snd_via82xx_free(chip);
> +exit:
> + return err;
Doubly goto doesn't look like an improvement.
Takashi
[toc] | [prev] | [next] | [standalone]
| From | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| Date | 2017-08-22 21:20 +0200 |
| Message-ID | <uhmSw-6HP-75@gated-at.bofh.it> |
| In reply to | #1717617 |
On Tue, Aug 22, 2017 at 07:43:08PM +0200, SF Markus Elfring wrote:
> @@ -1121,30 +1121,27 @@ static int snd_via82xx_create(struct snd_card *card,
>
> if ((err = pci_request_regions(pci, card->driver)) < 0) {
> kfree(chip);
> - pci_disable_device(pci);
> - return err;
> + goto disable_device;
> }
[ snip ]
> @@ -1153,6 +1150,14 @@ static int snd_via82xx_create(struct snd_card *card,
>
> *r_via = chip;
> return 0;
> +
> +disable_device:
> + pci_disable_device(pci);
> + goto exit;
Why is this "goto exit" here? It's leaking now.
> +free_chip:
> + snd_via82xx_free(chip);
> +exit:
> + return err;
> }
regards,
dan carpenter
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2017-08-22 22:10 +0200 |
| Message-ID | <uhnES-7gO-9@gated-at.bofh.it> |
| In reply to | #1717707 |
>> @@ -1121,30 +1121,27 @@ static int snd_via82xx_create(struct snd_card *card,
>>
>> if ((err = pci_request_regions(pci, card->driver)) < 0) {
>> kfree(chip);
>> - pci_disable_device(pci);
>> - return err;
>> + goto disable_device;
>> }
>
> [ snip ]
>
>> @@ -1153,6 +1150,14 @@ static int snd_via82xx_create(struct snd_card *card,
>>
>> *r_via = chip;
>> return 0;
>> +
>> +disable_device:
>> + pci_disable_device(pci);
>> + goto exit;
>
> Why is this "goto exit" here?
Should the same return statement be reached after the proposed refactoring?
Would you like to move such a function call to this source code place?
> It's leaking now.
How do you come to this conclusion?
>> +free_chip:
>> + snd_via82xx_free(chip);
>> +exit:
>> + return err;
>> }
Is this update suggestion worth for another look?
Regards,
Markus
[toc] | [prev] | [next] | [standalone]
| From | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| Date | 2017-08-22 22:20 +0200 |
| Message-ID | <uhnOx-7kH-15@gated-at.bofh.it> |
| In reply to | #1717797 |
On Tue, Aug 22, 2017 at 10:05:37PM +0200, SF Markus Elfring wrote:
> >> @@ -1121,30 +1121,27 @@ static int snd_via82xx_create(struct snd_card *card,
> >>
> >> if ((err = pci_request_regions(pci, card->driver)) < 0) {
> >> kfree(chip);
> >> - pci_disable_device(pci);
> >> - return err;
> >> + goto disable_device;
Ah, you're right. It's not leaking. I thought you deleted the
kfree(chip);...
regards,
dan carpenter
[toc] | [prev] | [next] | [standalone]
| From | Takashi Iwai <tiwai@suse.de> |
|---|---|
| Date | 2017-08-22 22:20 +0200 |
| Subject | Re: [alsa-devel] [PATCH] ALSA: via82xx: Use common error handling code in snd_via82xx_create() |
| Message-ID | <uhnOy-7kH-25@gated-at.bofh.it> |
| In reply to | #1717801 |
On Tue, 22 Aug 2017 22:16:12 +0200,
Dan Carpenter wrote:
>
> On Tue, Aug 22, 2017 at 10:05:37PM +0200, SF Markus Elfring wrote:
> > >> @@ -1121,30 +1121,27 @@ static int snd_via82xx_create(struct snd_card *card,
> > >>
> > >> if ((err = pci_request_regions(pci, card->driver)) < 0) {
> > >> kfree(chip);
> > >> - pci_disable_device(pci);
> > >> - return err;
> > >> + goto disable_device;
>
> Ah, you're right. It's not leaking. I thought you deleted the
> kfree(chip);...
Well, this also suggests something wrong by the patch...
If you can't achieve it cleanly, better not to touch it in a
half-baked way.
Takashi
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web