* [PATCH 0/5] fix error return code
@ 2014-08-07 12:49 Julia Lawall
2014-08-07 12:49 ` [PATCH 3/5] drivers/atm/atmtcp.c: " Julia Lawall
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Julia Lawall @ 2014-08-07 12:49 UTC (permalink / raw)
To: coreteam-Cap9r6Oaw4JrovVCs/uTlw
Cc: kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-atm-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
netfilter-devel-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA
The complate semantic patch that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
// identify a function that returns a negative return value at least once.
@ok exists@
identifier f,ret,i;
expression e;
constant c;
@@
f(...) {
... when any
(
return -c@i;
|
ret = -c@i;
... when != ret = e
return ret;
|
if (ret < 0) { ... return ret; }
)
... when any
}
// identify a case where the return variable is set to a non-negative value
// and then returned in error-handling code
@r exists@
identifier ret,ok.f,fn;
expression e1,e2,e3,e4,e5,e6,x;
statement S,S1;
position p1,p2,p3;
@@
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
}
// ignore the above if there is some path where the variable is set to
// something else
@bad depends on !bad0 exists@
position r.p1,r.p2;
statement S1,S2;
identifier r.ret;
expression e1;
@@
(
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
// likewise ignore it if there has been an intervening return
@bad2 depends on !bad0 && !bad && !bad1 exists@
position r.p1,r.p2;
identifier r.ret;
expression e1;
statement S2;
constant c;
@@
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] 12+ messages in thread
* [PATCH 3/5] drivers/atm/atmtcp.c: fix error return code
2014-08-07 12:49 [PATCH 0/5] fix error return code Julia Lawall
@ 2014-08-07 12:49 ` Julia Lawall
2014-08-07 13:10 ` chas williams - CONTRACTOR
2014-08-07 12:49 ` [PATCH 2/5] solos-pci: " Julia Lawall
2014-08-07 12:49 ` [PATCH 4/5] netfilter: nf_tables: " Julia Lawall
2 siblings, 1 reply; 12+ messages in thread
From: Julia Lawall @ 2014-08-07 12:49 UTC (permalink / raw)
To: Chas Williams; +Cc: kernel-janitors, linux-atm-general, netdev, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Convert a zero return value on error to a negative one, as returned
elsewhere in the function.
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>
---
Another return value could be more appropriate.
drivers/atm/atmtcp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index 0e3f8f9..c8e4fb4 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -299,6 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
read_unlock(&vcc_sklist_lock);
if (!out_vcc) {
+ result = -ESRCH;
atomic_inc(&vcc->stats->tx_err);
goto done;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/5] solos-pci: fix error return code
2014-08-07 12:49 [PATCH 0/5] fix error return code Julia Lawall
2014-08-07 12:49 ` [PATCH 3/5] drivers/atm/atmtcp.c: " Julia Lawall
@ 2014-08-07 12:49 ` Julia Lawall
2014-08-07 13:14 ` chas williams - CONTRACTOR
2014-08-07 23:04 ` David Miller
2014-08-07 12:49 ` [PATCH 4/5] netfilter: nf_tables: " Julia Lawall
2 siblings, 2 replies; 12+ messages in thread
From: Julia Lawall @ 2014-08-07 12:49 UTC (permalink / raw)
To: Chas Williams; +Cc: kernel-janitors, linux-atm-general, netdev, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Convert a zero return value on error to a negative one, as returned
elsewhere in the function.
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/atm/solos-pci.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 943cf0d..7652e8d 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1278,6 +1278,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
card->dma_bounce = kmalloc(card->nr_ports * BUF_SIZE, GFP_KERNEL);
if (!card->dma_bounce) {
dev_warn(&card->dev->dev, "Failed to allocate DMA bounce buffers\n");
+ err = -ENOMEM;
/* Fallback to MMIO doesn't work */
goto out_unmap_both;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/5] netfilter: nf_tables: fix error return code
2014-08-07 12:49 [PATCH 0/5] fix error return code Julia Lawall
2014-08-07 12:49 ` [PATCH 3/5] drivers/atm/atmtcp.c: " Julia Lawall
2014-08-07 12:49 ` [PATCH 2/5] solos-pci: " Julia Lawall
@ 2014-08-07 12:49 ` Julia Lawall
2014-08-11 16:41 ` Pablo Neira Ayuso
2 siblings, 1 reply; 12+ messages in thread
From: Julia Lawall @ 2014-08-07 12:49 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: kernel-janitors, Patrick McHardy, Jozsef Kadlecsik,
David S. Miller, netfilter-devel, coreteam, netdev, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Convert a zero return value on error to a negative one, as returned
elsewhere in the function.
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>
---
net/netfilter/nf_tables_api.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index b8035c2..ffd063e 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -3134,8 +3134,10 @@ static int nft_del_setelem(struct nft_ctx *ctx, struct nft_set *set,
goto err2;
trans = nft_trans_elem_alloc(ctx, NFT_MSG_DELSETELEM, set);
- if (trans == NULL)
+ if (trans == NULL) {
+ err = -ENOMEM;
goto err2;
+ }
nft_trans_elem(trans) = elem;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] drivers/atm/atmtcp.c: fix error return code
2014-08-07 12:49 ` [PATCH 3/5] drivers/atm/atmtcp.c: " Julia Lawall
@ 2014-08-07 13:10 ` chas williams - CONTRACTOR
2014-08-07 13:25 ` Julia Lawall
2014-08-07 13:31 ` Julia Lawall
0 siblings, 2 replies; 12+ messages in thread
From: chas williams - CONTRACTOR @ 2014-08-07 13:10 UTC (permalink / raw)
To: Julia Lawall; +Cc: kernel-janitors, linux-atm-general, netdev, linux-kernel
On Thu, 7 Aug 2014 14:49:06 +0200
Julia Lawall <Julia.Lawall@lip6.fr> wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Convert a zero return value on error to a negative one, as returned
> elsewhere in the function.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
...
>
> diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
> index 0e3f8f9..c8e4fb4 100644
> --- a/drivers/atm/atmtcp.c
> +++ b/drivers/atm/atmtcp.c
> @@ -299,6 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
> out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
> read_unlock(&vcc_sklist_lock);
> if (!out_vcc) {
> + result = -ESRCH;
This should probably be -EUNATCH to match the rest of the code.
> atomic_inc(&vcc->stats->tx_err);
> goto done;
> }
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] solos-pci: fix error return code
2014-08-07 12:49 ` [PATCH 2/5] solos-pci: " Julia Lawall
@ 2014-08-07 13:14 ` chas williams - CONTRACTOR
2014-08-07 23:04 ` David Miller
1 sibling, 0 replies; 12+ messages in thread
From: chas williams - CONTRACTOR @ 2014-08-07 13:14 UTC (permalink / raw)
To: Julia Lawall; +Cc: kernel-janitors, linux-atm-general, netdev, linux-kernel
On Thu, 7 Aug 2014 14:49:07 +0200
Julia Lawall <Julia.Lawall@lip6.fr> wrote:
...
> drivers/atm/solos-pci.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
> index 943cf0d..7652e8d 100644
> --- a/drivers/atm/solos-pci.c
> +++ b/drivers/atm/solos-pci.c
> @@ -1278,6 +1278,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
> card->dma_bounce = kmalloc(card->nr_ports * BUF_SIZE, GFP_KERNEL);
> if (!card->dma_bounce) {
> dev_warn(&card->dev->dev, "Failed to allocate DMA bounce buffers\n");
> + err = -ENOMEM;
> /* Fallback to MMIO doesn't work */
> goto out_unmap_both;
> }
>
Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] drivers/atm/atmtcp.c: fix error return code
2014-08-07 13:10 ` chas williams - CONTRACTOR
@ 2014-08-07 13:25 ` Julia Lawall
2014-08-07 13:31 ` Julia Lawall
1 sibling, 0 replies; 12+ messages in thread
From: Julia Lawall @ 2014-08-07 13:25 UTC (permalink / raw)
To: chas williams - CONTRACTOR
Cc: kernel-janitors, linux-atm-general, netdev, linux-kernel
On Thu, 7 Aug 2014, chas williams - CONTRACTOR wrote:
> On Thu, 7 Aug 2014 14:49:06 +0200
> Julia Lawall <Julia.Lawall@lip6.fr> wrote:
>
> > From: Julia Lawall <Julia.Lawall@lip6.fr>
> >
> > Convert a zero return value on error to a negative one, as returned
> > elsewhere in the function.
> >
> > A simplified version of the semantic match that finds this problem is as
> > follows: (http://coccinelle.lip6.fr/)
> ...
> >
> > diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
> > index 0e3f8f9..c8e4fb4 100644
> > --- a/drivers/atm/atmtcp.c
> > +++ b/drivers/atm/atmtcp.c
> > @@ -299,6 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
> > out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
> > read_unlock(&vcc_sklist_lock);
> > if (!out_vcc) {
> > + result = -ESRCH;
>
> This should probably be -EUNATCH to match the rest of the code.
Thanks. I will send a new version.
julia
> > atomic_inc(&vcc->stats->tx_err);
> > goto done;
> > }
> >
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] drivers/atm/atmtcp.c: fix error return code
2014-08-07 13:10 ` chas williams - CONTRACTOR
2014-08-07 13:25 ` Julia Lawall
@ 2014-08-07 13:31 ` Julia Lawall
2014-08-07 13:41 ` chas williams - CONTRACTOR
2014-08-07 23:05 ` David Miller
1 sibling, 2 replies; 12+ messages in thread
From: Julia Lawall @ 2014-08-07 13:31 UTC (permalink / raw)
To: chas williams - CONTRACTOR
Cc: kernel-janitors, linux-atm-general, netdev, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Convert a zero return value on error to a negative one, as returned
elsewhere in the function.
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>
---
v2; changed error code to -EUNATCH
drivers/atm/atmtcp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index 0e3f8f9..c8e4fb4 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -299,6 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
read_unlock(&vcc_sklist_lock);
if (!out_vcc) {
+ result = -EUNATCH;
atomic_inc(&vcc->stats->tx_err);
goto done;
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] drivers/atm/atmtcp.c: fix error return code
2014-08-07 13:31 ` Julia Lawall
@ 2014-08-07 13:41 ` chas williams - CONTRACTOR
2014-08-07 23:05 ` David Miller
1 sibling, 0 replies; 12+ messages in thread
From: chas williams - CONTRACTOR @ 2014-08-07 13:41 UTC (permalink / raw)
To: Julia Lawall; +Cc: kernel-janitors, linux-atm-general, netdev, linux-kernel
On Thu, 7 Aug 2014 15:31:05 +0200 (CEST)
Julia Lawall <julia.lawall@lip6.fr> wrote:
> diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
> index 0e3f8f9..c8e4fb4 100644
> --- a/drivers/atm/atmtcp.c
> +++ b/drivers/atm/atmtcp.c
> @@ -299,6 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
> out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
> read_unlock(&vcc_sklist_lock);
> if (!out_vcc) {
> + result = -EUNATCH;
> atomic_inc(&vcc->stats->tx_err);
> goto done;
> }
>
Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] solos-pci: fix error return code
2014-08-07 12:49 ` [PATCH 2/5] solos-pci: " Julia Lawall
2014-08-07 13:14 ` chas williams - CONTRACTOR
@ 2014-08-07 23:04 ` David Miller
1 sibling, 0 replies; 12+ messages in thread
From: David Miller @ 2014-08-07 23:04 UTC (permalink / raw)
To: Julia.Lawall
Cc: chas, kernel-janitors, linux-atm-general, netdev, linux-kernel
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Thu, 7 Aug 2014 14:49:07 +0200
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Convert a zero return value on error to a negative one, as returned
> elsewhere in the function.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
...
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Applied.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] drivers/atm/atmtcp.c: fix error return code
2014-08-07 13:31 ` Julia Lawall
2014-08-07 13:41 ` chas williams - CONTRACTOR
@ 2014-08-07 23:05 ` David Miller
1 sibling, 0 replies; 12+ messages in thread
From: David Miller @ 2014-08-07 23:05 UTC (permalink / raw)
To: julia.lawall
Cc: chas, kernel-janitors, linux-atm-general, netdev, linux-kernel
From: Julia Lawall <julia.lawall@lip6.fr>
Date: Thu, 7 Aug 2014 15:31:05 +0200 (CEST)
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Convert a zero return value on error to a negative one, as returned
> elsewhere in the function.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
...
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>
> ---
> v2; changed error code to -EUNATCH
Applied.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] netfilter: nf_tables: fix error return code
2014-08-07 12:49 ` [PATCH 4/5] netfilter: nf_tables: " Julia Lawall
@ 2014-08-11 16:41 ` Pablo Neira Ayuso
0 siblings, 0 replies; 12+ messages in thread
From: Pablo Neira Ayuso @ 2014-08-11 16:41 UTC (permalink / raw)
To: Julia Lawall
Cc: kernel-janitors, Patrick McHardy, Jozsef Kadlecsik,
David S. Miller, netfilter-devel, coreteam, netdev, linux-kernel
On Thu, Aug 07, 2014 at 02:49:08PM +0200, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Convert a zero return value on error to a negative one, as returned
> elsewhere in the function.
Applied, thanks Julia.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2014-08-11 16:41 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-07 12:49 [PATCH 0/5] fix error return code Julia Lawall
2014-08-07 12:49 ` [PATCH 3/5] drivers/atm/atmtcp.c: " Julia Lawall
2014-08-07 13:10 ` chas williams - CONTRACTOR
2014-08-07 13:25 ` Julia Lawall
2014-08-07 13:31 ` Julia Lawall
2014-08-07 13:41 ` chas williams - CONTRACTOR
2014-08-07 23:05 ` David Miller
2014-08-07 12:49 ` [PATCH 2/5] solos-pci: " Julia Lawall
2014-08-07 13:14 ` chas williams - CONTRACTOR
2014-08-07 23:04 ` David Miller
2014-08-07 12:49 ` [PATCH 4/5] netfilter: nf_tables: " Julia Lawall
2014-08-11 16:41 ` Pablo Neira Ayuso
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).