* [PATCH 0/5] fix error return code
@ 2014-11-23 13:11 Julia Lawall
2014-11-23 13:11 ` [PATCH 1/5] mptfusion: " Julia Lawall
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Julia Lawall @ 2014-11-23 13:11 UTC (permalink / raw)
To: linux-sh
Cc: kernel-janitors, linux-samsung-soc, linux-arm-kernel, dri-devel,
linux-kernel, MPT-FusionLinux.pdl, linux-scsi, linux-pcmcia
The complate semantic patch that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@ok exists@
identifier f,ret,i;
expression e;
constant c;
@@
// identify a function that returns a negative return value at least once.
f(...) {
... when any
(
return -c@i;
|
ret = -c@i;
... when != ret = e
return ret;
|
if (ret < 0) { ... return ret; }
)
... when any
}
@r exists@
identifier ret,ok.f,fn;
expression e1,e2,e3,e4,e5,e6,x;
statement S,S1;
position p1,p2,p3;
@@
// identify a case where the return variable is set to a non-negative value
// and then returned in error-handling code
f(...) {
... when any
(
if@p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != \(ret = e1\|ret++\|ret--\|ret+=e1\|ret-=e1\)
when != &ret
when any
(
if (<+... ret = e5 ...+>) S1
|
if (<+... &ret ...+>) S1
|
if@p2(<+...x = fn(...)...+>)
{
... when != ret = e6
when forall
return@p3 ret;
}
|
break;
|
x = fn(...)
... when != \(ret = e4\|ret++\|ret--\|ret+=e4\|ret-=e4\)
when != &ret
(
if (<+... ret = e3 ...+>) S
|
if (<+... &ret ...+>) S
|
if@p2(<+...\(x != 0\|x < 0\|x == NULL\|IS_ERR(x)\)...+>)
{
... when != ret = e2
when forall
return@p3 ret;
}
)
)
... when any
}
@printer depends on r@
position p;
identifier ok.f,pr;
constant char [] c;
@@
f(...) { <...pr@p(...,c,...)...> }
@bad0 exists@
identifier r.ret,ok.f,g != {ERR_PTR,IS_ERR};
position p != printer.p;
@@
f(...) { ... when any
g@p(...,ret,...)
... when any
}
@bad depends on !bad0 exists@
position r.p1,r.p2;
statement S1,S2;
identifier r.ret;
expression e1;
@@
// ignore the above if there is some path where the variable is set to
// something else
(
if@p1 (\(ret < 0\|ret != 0\)) S1
|
ret@p1 = 0
)
... when any
\(ret = e1\|ret++\|ret--\|ret+=e1\|ret-=e1\|&ret\)
... when any
if@p2(...) S2
@bad1 depends on !bad0 && !bad exists@
position r.p2;
statement S2;
identifier r.ret;
expression e1;
constant c;
@@
ret = -c
... when != \(ret = e1\|ret++\|ret--\|ret+=e1\|ret-=e1\)
when != &ret
when any
if@p2(...) S2
@bad2 depends on !bad0 && !bad && !bad1 exists@
position r.p1,r.p2;
identifier r.ret;
expression e1;
statement S2;
constant c;
@@
// likewise ignore it if there has been an intervening return
ret@p1 = 0
... when != if (...) { ... ret = e1 ... return ret; }
when != if (...) { ... return -c; }
when any
if@p2(...) S2
@script:python depends on !bad0 && !bad && !bad1 && !bad2@
p1 << r.p1;
p2 << r.p2;
p3 << r.p3;
@@
cocci.print_main("",p1)
cocci.print_secs("",p2)
cocci.print_secs("",p3)
// </smpl>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/5] mptfusion: fix error return code
2014-11-23 13:11 [PATCH 0/5] fix error return code Julia Lawall
@ 2014-11-23 13:11 ` Julia Lawall
2014-11-23 13:11 ` [PATCH 2/5] drm/exynos/ipp: " Julia Lawall
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Julia Lawall @ 2014-11-23 13:11 UTC (permalink / raw)
To: Nagalakshmi Nandigama
Cc: kernel-janitors, Praveen Krishnamoorthy, Sreekanth Reddy,
Abhijit Mahajan, MPT-FusionLinux.pdl, linux-scsi, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Return a negative error code on failure.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
drivers/message/fusion/mptfc.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index d8bf84a..629df6d 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -1325,8 +1325,10 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
"mptfc_wq_%d", sh->host_no);
ioc->fc_rescan_work_q =
create_singlethread_workqueue(ioc->fc_rescan_work_q_name);
- if (!ioc->fc_rescan_work_q)
+ if (!ioc->fc_rescan_work_q) {
+ error = -ENOMEM;
goto out_mptfc_probe;
+ }
/*
* Pre-fetch FC port WWN and stuff...
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] drm/exynos/ipp: fix error return code
2014-11-23 13:11 [PATCH 0/5] fix error return code Julia Lawall
2014-11-23 13:11 ` [PATCH 1/5] mptfusion: " Julia Lawall
@ 2014-11-23 13:11 ` Julia Lawall
2014-11-23 13:11 ` [PATCH 3/5] electra_cf: " Julia Lawall
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Julia Lawall @ 2014-11-23 13:11 UTC (permalink / raw)
To: Inki Dae
Cc: kernel-janitors, Joonyoung Shim, Seung-Woo Kim, Kyungmin Park,
David Airlie, Kukjin Kim, dri-devel, linux-arm-kernel,
linux-samsung-soc, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Propagate the returned error code on failure.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
drivers/gpu/drm/exynos/exynos_drm_ipp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 00d74b1..d5ad17d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -426,18 +426,21 @@ int exynos_drm_ipp_set_property(struct drm_device *drm_dev, void *data,
c_node->start_work = ipp_create_cmd_work();
if (IS_ERR(c_node->start_work)) {
DRM_ERROR("failed to create start work.\n");
+ ret = PTR_ERR(c_node->start_work);
goto err_remove_id;
}
c_node->stop_work = ipp_create_cmd_work();
if (IS_ERR(c_node->stop_work)) {
DRM_ERROR("failed to create stop work.\n");
+ ret = PTR_ERR(c_node->stop_work);
goto err_free_start;
}
c_node->event_work = ipp_create_event_work();
if (IS_ERR(c_node->event_work)) {
DRM_ERROR("failed to create event work.\n");
+ ret = PTR_ERR(c_node->event_work);
goto err_free_stop;
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] electra_cf: fix error return code
2014-11-23 13:11 [PATCH 0/5] fix error return code Julia Lawall
2014-11-23 13:11 ` [PATCH 1/5] mptfusion: " Julia Lawall
2014-11-23 13:11 ` [PATCH 2/5] drm/exynos/ipp: " Julia Lawall
@ 2014-11-23 13:11 ` Julia Lawall
2014-11-23 13:11 ` [PATCH 4/5] drm/rcar-du: " Julia Lawall
2014-11-23 13:11 ` [PATCH 5/5] drivers/gpu/drm: " Julia Lawall
4 siblings, 0 replies; 7+ messages in thread
From: Julia Lawall @ 2014-11-23 13:11 UTC (permalink / raw)
To: linux-pcmcia; +Cc: kernel-janitors, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Return a negative error code on failure.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
drivers/pcmcia/electra_cf.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 7f9950d..6a67a00 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -250,6 +250,7 @@ static int electra_cf_probe(struct platform_device *ofdev)
cf->socket.pci_irq = cf->irq;
+ status = -EINVAL;
prop = of_get_property(np, "card-detect-gpio", NULL);
if (!prop)
goto fail1;
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] drm/rcar-du: fix error return code
2014-11-23 13:11 [PATCH 0/5] fix error return code Julia Lawall
` (2 preceding siblings ...)
2014-11-23 13:11 ` [PATCH 3/5] electra_cf: " Julia Lawall
@ 2014-11-23 13:11 ` Julia Lawall
2014-11-26 22:01 ` Laurent Pinchart
2014-11-23 13:11 ` [PATCH 5/5] drivers/gpu/drm: " Julia Lawall
4 siblings, 1 reply; 7+ messages in thread
From: Julia Lawall @ 2014-11-23 13:11 UTC (permalink / raw)
To: Laurent Pinchart
Cc: kernel-janitors, David Airlie, dri-devel, linux-sh, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Propagate the error code on failure.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 088bfd8..23cc910 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -586,7 +586,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
if (irq < 0) {
dev_err(rcdu->dev, "no IRQ for CRTC %u\n", index);
- return ret;
+ return irq;
}
ret = devm_request_irq(rcdu->dev, irq, rcar_du_crtc_irq, irqflags,
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] drivers/gpu/drm: fix error return code
2014-11-23 13:11 [PATCH 0/5] fix error return code Julia Lawall
` (3 preceding siblings ...)
2014-11-23 13:11 ` [PATCH 4/5] drm/rcar-du: " Julia Lawall
@ 2014-11-23 13:11 ` Julia Lawall
4 siblings, 0 replies; 7+ messages in thread
From: Julia Lawall @ 2014-11-23 13:11 UTC (permalink / raw)
To: David Airlie; +Cc: kernel-janitors, dri-devel, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Return a negative error code on failure.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
drivers/gpu/drm/gma500/psb_drv.c | 8 ++++++--
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index 6ec3a90..e405414 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -306,12 +306,16 @@ static int psb_driver_load(struct drm_device *dev, unsigned long flags)
goto out_err;
dev_priv->mmu = psb_mmu_driver_init(dev, 1, 0, 0);
- if (!dev_priv->mmu)
+ if (!dev_priv->mmu) {
+ ret = -ENOMEM;
goto out_err;
+ }
dev_priv->pf_pd = psb_mmu_alloc_pd(dev_priv->mmu, 1, 0);
- if (!dev_priv->pf_pd)
+ if (!dev_priv->pf_pd) {
+ ret = -ENOMEM;
goto out_err;
+ }
ret = psb_do_init(dev);
if (ret)
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index 56c6055..c0fb5fa 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -678,6 +678,7 @@ static int omap_dmm_probe(struct platform_device *dev)
&omap_dmm->refill_pa, GFP_KERNEL);
if (!omap_dmm->refill_va) {
dev_err(&dev->dev, "could not allocate refill memory\n");
+ ret = -ENOMEM;
goto fail;
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 4/5] drm/rcar-du: fix error return code
2014-11-23 13:11 ` [PATCH 4/5] drm/rcar-du: " Julia Lawall
@ 2014-11-26 22:01 ` Laurent Pinchart
0 siblings, 0 replies; 7+ messages in thread
From: Laurent Pinchart @ 2014-11-26 22:01 UTC (permalink / raw)
To: Julia Lawall
Cc: kernel-janitors, David Airlie, dri-devel, linux-sh, linux-kernel
Hi Julia,
Thank you for the patch.
On Sunday 23 November 2014 14:11:17 Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Propagate the error code on failure.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> identifier ret; expression e1,e2;
> @@
> (
> if (\(ret < 0\|ret != 0\))
> { ... return ret; }
>
> ret = 0
> )
> ... when != ret = e1
> when != &ret
> *if(...)
> {
> ... when != ret = e2
> when forall
> return ret;
> }
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
I've applied the patch to my tree and sent a pull request.
> ---
> drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index 088bfd8..23cc910 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
> @@ -586,7 +586,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp,
> unsigned int index)
>
> if (irq < 0) {
> dev_err(rcdu->dev, "no IRQ for CRTC %u\n", index);
> - return ret;
> + return irq;
> }
>
> ret = devm_request_irq(rcdu->dev, irq, rcar_du_crtc_irq, irqflags,
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-11-26 22:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-23 13:11 [PATCH 0/5] fix error return code Julia Lawall
2014-11-23 13:11 ` [PATCH 1/5] mptfusion: " Julia Lawall
2014-11-23 13:11 ` [PATCH 2/5] drm/exynos/ipp: " Julia Lawall
2014-11-23 13:11 ` [PATCH 3/5] electra_cf: " Julia Lawall
2014-11-23 13:11 ` [PATCH 4/5] drm/rcar-du: " Julia Lawall
2014-11-26 22:01 ` Laurent Pinchart
2014-11-23 13:11 ` [PATCH 5/5] drivers/gpu/drm: " Julia Lawall
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).