mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()'
@ 2017-09-10 11:53 Christophe JAILLET
  2017-09-11  7:21 ` Hans Verkuil
  0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2017-09-10 11:53 UTC (permalink / raw)
  To: mchehab, hans.verkuil, Julia.Lawall
  Cc: linux-kernel, kernel-janitors, Christophe JAILLET

If this memory allocation fails, we must release some resources, as
already done in the code below and above.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 samples/v4l/v4l2-pci-skeleton.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c
index 483e9bca9444..f520e3aef9c6 100644
--- a/samples/v4l/v4l2-pci-skeleton.c
+++ b/samples/v4l/v4l2-pci-skeleton.c
@@ -772,8 +772,10 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	/* Allocate a new instance */
 	skel = devm_kzalloc(&pdev->dev, sizeof(struct skeleton), GFP_KERNEL);
-	if (!skel)
-		return -ENOMEM;
+	if (!skel) {
+		ret = -ENOMEM;
+		goto disable_pci;
+	}
 
 	/* Allocate the interrupt */
 	ret = devm_request_irq(&pdev->dev, pdev->irq,
-- 
2.11.0

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()'
  2017-09-10 11:53 [PATCH] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()' Christophe JAILLET
@ 2017-09-11  7:21 ` Hans Verkuil
  0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2017-09-11  7:21 UTC (permalink / raw)
  To: Christophe JAILLET, mchehab, hans.verkuil, Julia.Lawall
  Cc: linux-kernel, kernel-janitors

On 09/10/2017 01:53 PM, Christophe JAILLET wrote:
> If this memory allocation fails, we must release some resources, as
> already done in the code below and above.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Please repost and add the linux-media mailinglist to the CC list. That way it ends up
in our patchwork system and it won't be forgotten.

Regards,

	Hans

> ---
>  samples/v4l/v4l2-pci-skeleton.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c
> index 483e9bca9444..f520e3aef9c6 100644
> --- a/samples/v4l/v4l2-pci-skeleton.c
> +++ b/samples/v4l/v4l2-pci-skeleton.c
> @@ -772,8 +772,10 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  
>  	/* Allocate a new instance */
>  	skel = devm_kzalloc(&pdev->dev, sizeof(struct skeleton), GFP_KERNEL);
> -	if (!skel)
> -		return -ENOMEM;
> +	if (!skel) {
> +		ret = -ENOMEM;
> +		goto disable_pci;
> +	}
>  
>  	/* Allocate the interrupt */
>  	ret = devm_request_irq(&pdev->dev, pdev->irq,
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-09-11  7:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-10 11:53 [PATCH] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()' Christophe JAILLET
2017-09-11  7:21 ` Hans Verkuil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®