usb: fix four memleak
Subsystems (4)
cover usb: fix four memleak
change address from "Libo Chen <[email protected]>" to "Libo Chen <[email protected]>"
fix four goto wrong tag, avoid memleak
Libo Chen (4):
usb: ehci-s5p: fix memleak when devm_usb_get_phy fail
usb: isp1760-if: fix memleak when platform_get_resource fail
usb: ohci: fix goto wrong tag in err case
usb: tilegx: fix memleak when create hcd fail
drivers/usb/host/ehci-s5p.c | 1 + drivers/usb/host/isp1760-if.c | 4 +++- drivers/usb/host/ohci-nxp.c | 12 ++++++------ drivers/usb/host/ohci-tilegx.c | 7 +++++-- 4 files changed, 15 insertions(+), 9 deletions(-)
PATCH RESEND 1/4 usb: ehci-s5p: fix memleak when devm_usb_get_phy fail
When devm_usb_get_phy fail, we should free hcd
--- drivers/usb/host/ehci-s5p.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/usb/host/ehci-s5p.c +1 -0
@@ -107,6 +107,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)if (IS_ERR (phy)) {/* Fallback to pdata */ if (!pdata) { +usb_put_hcd (hcd);dev_warn (&pdev->dev,"no platform data or transceiver defined\n" );return -EPROBE_DEFER ; }else {
Signature · 1 line
1.7.1
Re: [PATCH RESEND 1/4] usb: ehci-s5p: fix memleak when devm_usb_get_phy fail
Quoted 12 lines · Libo Chen
When
devm_usb_get_phyfail, we should free hcdSigned-off-by Libo Chen <[email protected]>--- drivers/usb/host/ehci-s5p.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)drivers/usb/host/ehci-s5p.c +0
-0
drivers/usb/host/ehci-s5p.c static int s5p_ehci_probe(struct platform_device *pdev) · line 113
Quoted 7 lines
drivers/usb/host/ehci-s5p.c +1
-0@@ -107,6 +107,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)if (IS_ERR (phy)) {/* Fallback to pdata */ if (!pdata) { +usb_put_hcd (hcd);dev_warn (&pdev->dev,"no platform data or transceiver defined\n" );return -EPROBE_DEFER ; }else {
PATCH RESEND 2/4 usb: isp1760-if: fix memleak when platform_get_resource fail
In reply to Libo ChenWhen platform_get_resource fail, we should release_mem_region
--- drivers/usb/host/isp1760-if.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/usb/host/isp1760-if.c +3 -1
@@ -373,8 +373,10 @@ static int isp1760_plat_probe(struct platform_device *pdev) irq_res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (!irq_res) {pr_warning ("isp1760: IRQ resource not available\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto cleanup; } + irqflags |= irq_res->flags &IRQF_TRIGGER_MASK ;if (priv) {
Signature · 1 line
1.7.1
PATCH RESEND 3/4 usb: ohci: fix goto wrong tag in err case
In reply to Libo Chenfix goto wrong tag in usb_hcd_nxp_probe
--- drivers/usb/host/ohci-nxp.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/usb/host/ohci-nxp.c +6 -6
@@ -234,7 +234,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)if (usb_disabled ()) {dev_err (&pdev->dev,"USB is disabled\n" ); ret = -ENODEV ; - goto out; + goto out1; }/* Enable AHB slave USB clock, needed for further USB clock control */
@@ -265,13 +265,13 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)if (IS_ERR (usb_dev_clk)) {dev_err (&pdev->dev,"failed to acquire USB DEV Clock\n" ); ret =PTR_ERR (usb_dev_clk); - goto out4; + goto out3; } ret =clk_enable (usb_dev_clk);if (ret <0 ) {dev_err (&pdev->dev,"failed to start USB DEV Clock\n" ); - goto out5; + goto out4; }/* Enable USB otg clocks */
@@ -279,7 +279,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)if (IS_ERR (usb_otg_clk)) {dev_err (&pdev->dev,"failed to acquire USB DEV Clock\n" ); ret =PTR_ERR (usb_otg_clk); - goto out6; + goto out5; }__raw_writel (__raw_readl (USB_CTRL ) |USB_HOST_NEED_CLK_EN ,USB_CTRL );
@@ -287,7 +287,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev) ret =clk_enable (usb_otg_clk);if (ret <0 ) {dev_err (&pdev->dev,"failed to start USB DEV Clock\n" ); - goto out7; + goto out6; }isp1301_configure ();
@@ -296,7 +296,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)if (!hcd) {dev_err (&pdev->dev,"Failed to allocate HC buffer\n" ); ret = -ENOMEM ; - goto out8; + goto out7; } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Signature · 1 line
1.7.1
Alan Stern
maintainerRe: [PATCH RESEND 3/4] usb: ohci: fix goto wrong tag in err case
Quoted 12 lines · Libo Chen
fix goto wrong tag in
usb_hcd_nxp_probeSigned-off-by Libo Chen <[email protected]>--- drivers/usb/host/ohci-nxp.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)drivers/usb/host/ohci-nxp.c +0
-0
drivers/usb/host/ohci-nxp.c static int usb_hcd_nxp_probe(struct platform_device *pdev) · line 238
Quoted 6 lines
drivers/usb/host/ohci-nxp.c +1
-1@@ -234,7 +234,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)if (usb_disabled ()) {dev_err (&pdev->dev,"USB is disabled\n" ); ret = -ENODEV ; - goto out; + goto out1; }
Instead of renumbering all these statement labels, it would be better to replace them with names that have a real meaning. That would simplify future fixes.
Can you submit a patch to do that instead?
Alan Stern
PATCH RESEND 4/4 usb: tilegx: fix memleak when create hcd fail
In reply to Libo ChenWhen usb_create_hcd fail, we should call gxio_usb_host_destroy
--- drivers/usb/host/ohci-tilegx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/usb/host/ohci-tilegx.c +5 -2
@@ -112,8 +112,10 @@ static int ohci_hcd_tilegx_drv_probe(struct platform_device *pdev) hcd =usb_create_hcd (&ohci_tilegx_hc_driver, &pdev->dev,dev_name (&pdev->dev)); -if (!hcd) -return -ENOMEM ; +if (!hcd){ + ret = -ENOMEM ; + goto err_hcd; + }/* * We don't use rsrc_start to map in our registers, but seems like
@@ -165,6 +167,7 @@ err_have_irq: err_no_irq:tilegx_stop_ohc ();usb_put_hcd (hcd); +err_hcd:gxio_usb_host_destroy (&pdata->usb_ctx);return ret; }
Signature · 1 line
1.7.1
Re: [PATCH RESEND 4/4] usb: tilegx: fix memleak when create hcd fail
Quoted 6 lines · Libo Chen
When
usb_create_hcdfail, we should callgxio_usb_host_destroySigned-off-by Libo Chen <[email protected]>--- drivers/usb/host/ohci-tilegx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
Thanks; taken into the tile tree. I also made the same change to ehci-tilegx.c.
Signature · 2 lines
Chris Metcalf, Tilera Corp. http://www.tilera.com
Re: [PATCH RESEND 4/4] usb: tilegx: fix memleak when create hcd fail
Quoted 10 lines · Chris Metcalf
Quoted 6 lines · Libo Chen
When
usb_create_hcdfail, we should callgxio_usb_host_destroySigned-off-by Libo Chen <[email protected]>--- drivers/usb/host/ohci-tilegx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)Thanks; taken into the tile tree. I also made the same change to
ehci-tilegx.c.
Hi Chris,
Thanks reply, May be I miss. Please ignore this patch.
Re: [PATCH RESEND 4/4] usb: tilegx: fix memleak when create hcd fail
Quoted 9 lines · Libo Chen
Quoted 8 lines · Chris Metcalf
Quoted 6 lines · Libo Chen
When
usb_create_hcdfail, we should callgxio_usb_host_destroySigned-off-by Libo Chen <[email protected]>--- drivers/usb/host/ohci-tilegx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
Quoted 6 lines
Quoted 2 lines
Thanks; taken into the tile tree. I also made the same change to
ehci-tilegx.c.Hi Chris,
Thanks reply, May be I miss. Please ignore this patch.
Sorry, this patch is ok, no problem.
Quoted 5 lines
.
Re: [PATCH RESEND 4/4] usb: tilegx: fix memleak when create hcd fail
In reply to Libo ChenQuoted 25 lines · Libo Chen
When
usb_create_hcdfail, we should callgxio_usb_host_destroySigned-off-by Libo Chen <[email protected]>--- drivers/usb/host/ohci-tilegx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)drivers/usb/host/ohci-tilegx.c +4
-2@@ -112,8 +112,10 @@ static int ohci_hcd_tilegx_drv_probe(struct platform_device *pdev) hcd =usb_create_hcd (&ohci_tilegx_hc_driver, &pdev->dev,dev_name (&pdev->dev)); -if (!hcd) -return -ENOMEM ; +if (!hcd){ + ret = -ENOMEM ; + goto err_hcd; + }/* * We don't use rsrc_start to map in our registers, but seems like
drivers/usb/host/ohci-tilegx.c err_have_irq: · line 173
Quoted 7 lines
drivers/usb/host/ohci-tilegx.c +1
-0@@ -165,6 +167,7 @@ err_have_irq: err_no_irq:tilegx_stop_ohc ();usb_put_hcd (hcd); +err_hcd:gxio_usb_host_destroy (&pdata->usb_ctx);return ret; }