LinuxLists.cc - [PATCH 0/16] fix error return code

2015-04-05 12:19:04

Subject: [PATCH 0/16] fix error return code

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>

2015-04-05 12:14:46

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 1/16] wan: lmc: fix error return code

2015-04-05 12:14:50

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 2/16] [media] si4713: fix error return code

2015-04-05 12:19:02

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 4/16] [media] as102: fix error return code

2015-04-05 12:18:26

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 3/16] [media] radio: fix error return code

2015-04-05 12:18:05

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 5/16] ufs: fix error return code

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>

This patch also changes the subsequent dev_err call to use err rather
than recomputing PTR_ERR(hba->devfreq). The format of the error value
is changed from %ld to %d to reflect the type or err.

Signed-off-by: Julia Lawall <[email protected]>

---
drivers/scsi/ufs/ufshcd.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 2aa85e3..8b802d1 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5506,8 +5506,9 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
hba->devfreq = devfreq_add_device(dev, &ufs_devfreq_profile,
"simple_ondemand", NULL);
if (IS_ERR(hba->devfreq)) {
- dev_err(hba->dev, "Unable to register with devfreq %ld\n",
- PTR_ERR(hba->devfreq));
+ err = PTR_ERR(hba->devfreq);
+ dev_err(hba->dev, "Unable to register with devfreq %d\n",
+ err);
goto out_remove_scsi_host;
}
/* Suspend devfreq until the UFS device is detected */

2015-04-05 12:14:51

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 6/16] HSI: cmt_speech: fix error return code

2015-04-05 12:14:54

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 7/16] parport_sunbpp: fix error return code

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>

To satisfy checkpatch, this patch also changes leading spaces to a tab in
the first changed line, and extracts an assignment from an if condition.

Signed-off-by: Julia Lawall <[email protected]>

---
drivers/parport/parport_sunbpp.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index 01cf1c1..d7ad4b3 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -286,12 +286,17 @@ static int bpp_probe(struct platform_device *op)

ops = kmemdup(&parport_sunbpp_ops, sizeof(struct parport_operations),
GFP_KERNEL);
- if (!ops)
+ if (!ops) {
+ err = -ENOMEM;
goto out_unmap;
+ }

dprintk(("register_port\n"));
- if (!(p = parport_register_port((unsigned long)base, irq, dma, ops)))
+ p = parport_register_port((unsigned long)base, irq, dma, ops);
+ if (!p) {
+ err = -ENOMEM;
goto out_free_ops;
+ }

p->size = size;
p->dev = &op->dev;

2015-04-05 12:17:44

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 8/16] cosa: fix error return code

2015-04-05 12:17:24

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 9/16] HID: logitech-hidpp: fix error return code

2015-04-05 12:17:04

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 10/16] zram: fix error return code

2015-04-05 12:16:37

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 11/16] drm/msm/dp: fix error return code

2015-04-05 12:16:35

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 12/16] ib_srpt: fix error return code

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>

In the first case, the printk is changed to use the ret value, rather
than duplicating PTR_ERR(ch->thread). This requires changing the format
from %ld to %d, to account for the type of ret.

Signed-off-by: Julia Lawall <[email protected]>

---
drivers/infiniband/ulp/srpt/ib_srpt.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 6e0a477..5ec98f5 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2143,8 +2143,8 @@ retry:

ch->thread = kthread_run(srpt_compl_thread, ch, "ib_srpt_compl");
if (IS_ERR(ch->thread)) {
- printk(KERN_ERR "failed to create kernel thread %ld\n",
- PTR_ERR(ch->thread));
+ ret = PTR_ERR(ch->thread);
+ printk(KERN_ERR "failed to create kernel thread %d\n", ret);
ch->thread = NULL;
goto err_destroy_qp;
}
@@ -2590,6 +2590,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
" configured yet for initiator %s.\n", ch->sess_name);
rej->reason = __constant_cpu_to_be32(
SRP_LOGIN_REJ_CHANNEL_LIMIT_REACHED);
+ ret = -EINVAL;
goto destroy_ib;
}

@@ -2598,6 +2599,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
rej->reason = __constant_cpu_to_be32(
SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
pr_debug("Failed to create session\n");
+ ret = PTR_ERR(ch->sess);
goto deregister_session;
}
ch->sess->se_node_acl = &nacl->nacl;

2015-04-05 12:16:02

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 13/16] ALSA: au1x00: fix error return code

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 <[email protected]>

---
sound/mips/au1x00.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index fbcaa54..1e30e84 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -633,19 +633,25 @@ static int au1000_ac97_probe(struct platform_device *pdev)

au1000->stream[PLAYBACK] = kmalloc(sizeof(struct audio_stream),
GFP_KERNEL);
- if (!au1000->stream[PLAYBACK])
+ if (!au1000->stream[PLAYBACK]) {
+ err = -ENOMEM;
goto out;
+ }
au1000->stream[PLAYBACK]->dma = -1;

au1000->stream[CAPTURE] = kmalloc(sizeof(struct audio_stream),
GFP_KERNEL);
- if (!au1000->stream[CAPTURE])
+ if (!au1000->stream[CAPTURE]) {
+ err = -ENOMEM;
goto out;
+ }
au1000->stream[CAPTURE]->dma = -1;

r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!r)
+ if (!r) {
+ err = -ENODEV;
goto out;
+ }

err = -EBUSY;
au1000->ac97_res_port = request_mem_region(r->start, resource_size(r),

2015-04-05 12:15:59

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 14/16] soc: ti: knav_qmss_queue: fix error return code

2015-04-05 12:15:01

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 15/16] staging: lustre: lnet: lnet: fix error return code

2015-04-05 12:14:58

by Julia Lawall

[permalink] [raw]

Subject: [PATCH 16/16] NFC: pn533: fix error return code

2015-04-05 12:47:52

by Sebastian Reichel

[permalink] [raw]

Subject: Re: [PATCH 6/16] HSI: cmt_speech: fix error return code

Hi Julia,

On Sun, Apr 05, 2015 at 02:06:26PM +0200, Julia Lawall wrote:
> Return a negative error code on failure.
>
> A simplified version of the semantic match that finds this problem is as
> follows: [...]

Thanks, applied:

https://git.kernel.org/cgit/linux/kernel/git/sre/linux-hsi.git/commit/?h=for-next&id=265ef3ee9575e6d150f485d28dbe153a50d27f4c

-- Sebastian

Attachments:

(No filename) (370.00 B)
signature.asc (819.00 B)
Digital signature Download all attachments

2015-04-05 14:38:17

by Benjamin Tissoires

[permalink] [raw]

Subject: Re: [PATCH 9/16] HID: logitech-hidpp: fix error return code

On Sun, Apr 5, 2015 at 8:06 AM, Julia Lawall <[email protected]> wrote:
> 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 <[email protected]>
>
> ---

Reviewed-by: Benjamin Tissoires <[email protected]>

Thanks!
Benjamin

> drivers/hid/hid-logitech-hidpp.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
> index e77658c..ce9819f 100644
> --- a/drivers/hid/hid-logitech-hidpp.c
> +++ b/drivers/hid/hid-logitech-hidpp.c
> @@ -1210,6 +1210,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
> connected = hidpp_is_connected(hidpp);
> if (id->group != HID_GROUP_LOGITECH_DJ_DEVICE) {
> if (!connected) {
> + ret = -ENODEV;
> hid_err(hdev, "Device not connected");
> hid_device_io_stop(hdev);
> goto hid_parse_fail;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2015-04-05 16:06:41

by Takashi Iwai

[permalink] [raw]

Subject: Re: [alsa-devel] [PATCH 13/16] ALSA: au1x00: fix error return code

At Sun, 5 Apr 2015 14:06:33 +0200,
Julia Lawall wrote:
>
> 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 <[email protected]>

Applied, thanks.

Takashi

>
> ---
> sound/mips/au1x00.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
> index fbcaa54..1e30e84 100644
> --- a/sound/mips/au1x00.c
> +++ b/sound/mips/au1x00.c
> @@ -633,19 +633,25 @@ static int au1000_ac97_probe(struct platform_device *pdev)
>
> au1000->stream[PLAYBACK] = kmalloc(sizeof(struct audio_stream),
> GFP_KERNEL);
> - if (!au1000->stream[PLAYBACK])
> + if (!au1000->stream[PLAYBACK]) {
> + err = -ENOMEM;
> goto out;
> + }
> au1000->stream[PLAYBACK]->dma = -1;
>
> au1000->stream[CAPTURE] = kmalloc(sizeof(struct audio_stream),
> GFP_KERNEL);
> - if (!au1000->stream[CAPTURE])
> + if (!au1000->stream[CAPTURE]) {
> + err = -ENOMEM;
> goto out;
> + }
> au1000->stream[CAPTURE]->dma = -1;
>
> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (!r)
> + if (!r) {
> + err = -ENODEV;
> goto out;
> + }
>
> err = -EBUSY;
> au1000->ac97_res_port = request_mem_region(r->start, resource_size(r),
>
> _______________________________________________
> Alsa-devel mailing list
> [email protected]
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>

2015-04-05 18:00:26

by Bart Van Assche

[permalink] [raw]

Subject: Re: [PATCH 12/16] ib_srpt: fix error return code

On 04/05/15 14:06, Julia Lawall wrote:
> 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>
>
> In the first case, the printk is changed to use the ret value, rather
> than duplicating PTR_ERR(ch->thread). This requires changing the format
> from %ld to %d, to account for the type of ret.
>
> Signed-off-by: Julia Lawall <[email protected]>
>
> ---
> drivers/infiniband/ulp/srpt/ib_srpt.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
> index 6e0a477..5ec98f5 100644
> --- a/drivers/infiniband/ulp/srpt/ib_srpt.c
> +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
> @@ -2143,8 +2143,8 @@ retry:
>
> ch->thread = kthread_run(srpt_compl_thread, ch, "ib_srpt_compl");
> if (IS_ERR(ch->thread)) {
> - printk(KERN_ERR "failed to create kernel thread %ld\n",
> - PTR_ERR(ch->thread));
> + ret = PTR_ERR(ch->thread);
> + printk(KERN_ERR "failed to create kernel thread %d\n", ret);
> ch->thread = NULL;
> goto err_destroy_qp;
> }
> @@ -2590,6 +2590,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
> " configured yet for initiator %s.\n", ch->sess_name);
> rej->reason = __constant_cpu_to_be32(
> SRP_LOGIN_REJ_CHANNEL_LIMIT_REACHED);
> + ret = -EINVAL;
> goto destroy_ib;
> }
>
> @@ -2598,6 +2599,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
> rej->reason = __constant_cpu_to_be32(
> SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
> pr_debug("Failed to create session\n");
> + ret = PTR_ERR(ch->sess);
> goto deregister_session;
> }
> ch->sess->se_node_acl = &nacl->nacl;

This is not the proper way to fix srpt_cm_req_recv(). The kthread_run()
call must be moved from srpt_create_ch_ib() to after the session
registration code in srpt_cm_req_recv(), and the session registration
call + the kthread_run() call must be protected via a mutex against
concurrent HCA hot-plug removal events (see also srpt_remove_one() and
srpt_remove_sdev()).

Bart.

2015-04-05 20:57:41

by Jiri Kosina

[permalink] [raw]

Subject: Re: [PATCH 9/16] HID: logitech-hidpp: fix error return code

On Sun, 5 Apr 2015, Julia Lawall wrote:

> 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 <[email protected]>

Applied to for-4.1/logitech, thanks.

--
Jiri Kosina
SUSE Labs

2015-04-05 23:23:15

by Samuel Ortiz

[permalink] [raw]

Subject: Re: [PATCH 16/16] NFC: pn533: fix error return code

Hi Julia,

On Sun, Apr 05, 2015 at 02:06:36PM +0200, Julia Lawall wrote:
> 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 <[email protected]>
>
> ---
> drivers/nfc/pn533.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Applied, thanks.

Cheers,
Samuel.

2015-04-06 02:03:27

by Santosh Shilimkar

[permalink] [raw]

Subject: Re: [PATCH 14/16] soc: ti: knav_qmss_queue: fix error return code

On 4/5/15 5:06 AM, Julia Lawall wrote:
> 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 <[email protected]>
>
> ---
Acked-by: Santosh Shilimkar <[email protected]>

2015-04-06 06:42:08

by Zhen, Liang

[permalink] [raw]

Subject: Re: [HPDD-discuss] [PATCH 15/16] staging: lustre: lnet: lnet: fix error return code

Julia, yes this is a bug that we have already fixed in the latest Lustre.
Sorry we haven?t submitted this patch to kernel on time.

Thanks
Liang

On 4/5/15, 8:06 PM, "Julia Lawall" <[email protected]> wrote:

>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 <[email protected]>
>
>---
> drivers/staging/lustre/lnet/lnet/api-ni.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c
>b/drivers/staging/lustre/lnet/lnet/api-ni.c
>index faceb95..4a14e51 100644
>--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
>+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
>@@ -650,15 +650,19 @@ lnet_prepare(lnet_pid_t requested_pid)
>
> recs = lnet_res_containers_create(LNET_COOKIE_TYPE_ME, LNET_FL_MAX_MES,
> sizeof(lnet_me_t));
>- if (recs == NULL)
>+ if (recs == NULL) {
>+ rc = -ENOMEM;
> goto failed;
>+ }
>
> the_lnet.ln_me_containers = recs;
>
> recs = lnet_res_containers_create(LNET_COOKIE_TYPE_MD, LNET_FL_MAX_MDS,
> sizeof(lnet_libmd_t));
>- if (recs == NULL)
>+ if (recs == NULL) {
>+ rc = -ENOMEM;
> goto failed;
>+ }
>
> the_lnet.ln_md_containers = recs;
>
>
>_______________________________________________
>HPDD-discuss mailing list
>[email protected]
>https://lists.01.org/mailman/listinfo/hpdd-discuss

2015-04-07 19:26:15

by David Miller

[permalink] [raw]

Subject: Re: [PATCH 1/16] wan: lmc: fix error return code

From: Julia Lawall <[email protected]>
Date: Sun, 5 Apr 2015 14:06:21 +0200

> 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/)
...
> Signed-off-by: Julia Lawall <[email protected]>

Applied.

2015-04-07 19:26:25

by David Miller

[permalink] [raw]

Subject: Re: [PATCH 8/16] cosa: fix error return code

From: Julia Lawall <[email protected]>
Date: Sun, 5 Apr 2015 14:06:28 +0200

> 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/)
...
> Signed-off-by: Julia Lawall <[email protected]>

Applied.