* [PATCH 07/59] i2c/i2c-pxa: Fix possible NULL pointer dereference
@ 2013-02-24 22:44 Syam Sidhardhan
[not found] ` <1361745852-28629-1-git-send-email-s.syam-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Syam Sidhardhan @ 2013-02-24 22:44 UTC (permalink / raw)
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA
Cc: syamsidhardh-Re5JQEeQqe8AvxtiuMwx3w, wsa-z923LK4zBo2bacvFa/9K2g,
ben-linux-elnMNo+KYs3YtjvyW6yDsg
When platform_get_resource() returns NULL, there is a possible
NULL pointer dereference in release_mem_region(). Rearrange the
goto lables appropriately.
Signed-off-by: Syam Sidhardhan <s.syam-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
---
Only compile tested.
drivers/i2c/busses/i2c-pxa.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 1034d93..7ddda5c 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1104,18 +1104,18 @@ static int i2c_pxa_probe(struct platform_device *dev)
if (ret > 0)
ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type);
if (ret < 0)
- goto eclk;
+ goto emalloc;
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
irq = platform_get_irq(dev, 0);
if (res == NULL || irq < 0) {
ret = -ENODEV;
- goto eclk;
+ goto emalloc;
}
if (!request_mem_region(res->start, resource_size(res), res->name)) {
ret = -ENOMEM;
- goto eclk;
+ goto emalloc;
}
i2c->adap.owner = THIS_MODULE;
@@ -1209,9 +1209,9 @@ ereqirq:
eremap:
clk_put(i2c->clk);
eclk:
- kfree(i2c);
-emalloc:
release_mem_region(res->start, resource_size(res));
+emalloc:
+ kfree(i2c);
return ret;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <1361745852-28629-1-git-send-email-s.syam-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>]
* Re: [PATCH 07/59] i2c/i2c-pxa: Fix possible NULL pointer dereference [not found] ` <1361745852-28629-1-git-send-email-s.syam-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> @ 2013-02-25 8:44 ` Igor Grinberg [not found] ` <512B245A.1020703-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Igor Grinberg @ 2013-02-25 8:44 UTC (permalink / raw) To: Syam Sidhardhan Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, wsa-z923LK4zBo2bacvFa/9K2g, ben-linux-elnMNo+KYs3YtjvyW6yDsg On 02/25/13 00:44, Syam Sidhardhan wrote: > When platform_get_resource() returns NULL, there is a possible > NULL pointer dereference in release_mem_region(). Rearrange the > goto lables appropriately. > > Signed-off-by: Syam Sidhardhan <s.syam-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> I think this has been already addressed in [1], but I don't know if it was applied already... [1] https://patchwork.kernel.org/patch/2141301/ > --- > > Only compile tested. > > drivers/i2c/busses/i2c-pxa.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c > index 1034d93..7ddda5c 100644 > --- a/drivers/i2c/busses/i2c-pxa.c > +++ b/drivers/i2c/busses/i2c-pxa.c > @@ -1104,18 +1104,18 @@ static int i2c_pxa_probe(struct platform_device *dev) > if (ret > 0) > ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type); > if (ret < 0) > - goto eclk; > + goto emalloc; > > res = platform_get_resource(dev, IORESOURCE_MEM, 0); > irq = platform_get_irq(dev, 0); > if (res == NULL || irq < 0) { > ret = -ENODEV; > - goto eclk; > + goto emalloc; > } > > if (!request_mem_region(res->start, resource_size(res), res->name)) { > ret = -ENOMEM; > - goto eclk; > + goto emalloc; > } > > i2c->adap.owner = THIS_MODULE; > @@ -1209,9 +1209,9 @@ ereqirq: > eremap: > clk_put(i2c->clk); > eclk: > - kfree(i2c); > -emalloc: > release_mem_region(res->start, resource_size(res)); > +emalloc: > + kfree(i2c); > return ret; > } > > -- Regards, Igor. ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <512B245A.1020703-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>]
* Re: [PATCH 07/59] i2c/i2c-pxa: Fix possible NULL pointer dereference [not found] ` <512B245A.1020703-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org> @ 2013-02-25 14:54 ` Syam Sidhardhan 0 siblings, 0 replies; 3+ messages in thread From: Syam Sidhardhan @ 2013-02-25 14:54 UTC (permalink / raw) To: Igor Grinberg Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, wsa-z923LK4zBo2bacvFa/9K2g, ben-linux-elnMNo+KYs3YtjvyW6yDsg Hi Igor, On Mon, Feb 25, 2013 at 2:14 PM, Igor Grinberg <grinberg-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org> wrote: > On 02/25/13 00:44, Syam Sidhardhan wrote: >> When platform_get_resource() returns NULL, there is a possible >> NULL pointer dereference in release_mem_region(). Rearrange the >> goto lables appropriately. >> >> Signed-off-by: Syam Sidhardhan <s.syam-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> > > I think this has been already addressed in [1], > but I don't know if it was applied already... > > [1] https://patchwork.kernel.org/patch/2141301/ > >> --- >> >> Only compile tested. >> >> drivers/i2c/busses/i2c-pxa.c | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c >> index 1034d93..7ddda5c 100644 >> --- a/drivers/i2c/busses/i2c-pxa.c >> +++ b/drivers/i2c/busses/i2c-pxa.c >> @@ -1104,18 +1104,18 @@ static int i2c_pxa_probe(struct platform_device *dev) >> if (ret > 0) >> ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type); >> if (ret < 0) >> - goto eclk; >> + goto emalloc; >> >> res = platform_get_resource(dev, IORESOURCE_MEM, 0); >> irq = platform_get_irq(dev, 0); >> if (res == NULL || irq < 0) { >> ret = -ENODEV; >> - goto eclk; >> + goto emalloc; >> } >> >> if (!request_mem_region(res->start, resource_size(res), res->name)) { >> ret = -ENOMEM; >> - goto eclk; >> + goto emalloc; >> } >> >> i2c->adap.owner = THIS_MODULE; >> @@ -1209,9 +1209,9 @@ ereqirq: >> eremap: >> clk_put(i2c->clk); >> eclk: >> - kfree(i2c); >> -emalloc: >> release_mem_region(res->start, resource_size(res)); >> +emalloc: >> + kfree(i2c); >> return ret; >> } >> You are correct. It has been already posted by Cong Ding. Kindly ignore this patch. Thanks, Syam ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-25 14:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-24 22:44 [PATCH 07/59] i2c/i2c-pxa: Fix possible NULL pointer dereference Syam Sidhardhan
[not found] ` <1361745852-28629-1-git-send-email-s.syam-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2013-02-25 8:44 ` Igor Grinberg
[not found] ` <512B245A.1020703-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>
2013-02-25 14:54 ` Syam Sidhardhan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).