2009-07-28 16:01:57

by Julia Lawall

[permalink] [raw]
Subject: [PATCH 8/9] drivers/mmc: correct error-handling code

From: Julia Lawall <[email protected]>

sdhci_alloc_host returns an ERR_PTR value in an error case instead of NULL.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@match exists@
expression x, E;
statement S1, S2;
@@

x = sdhci_alloc_host(...)
... when != x = E
(
* if (x == NULL || ...) S1 else S2
|
* if (x == NULL && ...) S1 else S2
)
// </smpl>

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

---
drivers/mmc/host/sdhci-of.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of.c b/drivers/mmc/host/sdhci-of.c
index d79fa55..fb00bc5 100644
--- a/drivers/mmc/host/sdhci-of.c
+++ b/drivers/mmc/host/sdhci-of.c
@@ -226,7 +226,7 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev,
return -ENODEV;

host = sdhci_alloc_host(&ofdev->dev, sizeof(*of_host));
- if (!host)
+ if (IS_ERR(host))
return -ENOMEM;

of_host = sdhci_priv(host);


2009-07-28 16:11:20

by Anton Vorontsov

[permalink] [raw]
Subject: Re: [PATCH 8/9] drivers/mmc: correct error-handling code

On Tue, Jul 28, 2009 at 05:56:00PM +0200, Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> sdhci_alloc_host returns an ERR_PTR value in an error case instead of NULL.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @match exists@
> expression x, E;
> statement S1, S2;
> @@
>
> x = sdhci_alloc_host(...)
> ... when != x = E
> (
> * if (x == NULL || ...) S1 else S2
> |
> * if (x == NULL && ...) S1 else S2
> )
> // </smpl>
>
> Signed-off-by: Julia Lawall <[email protected]>

Acked-by: Anton Vorontsov <[email protected]>

Thanks,

> ---
> drivers/mmc/host/sdhci-of.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of.c b/drivers/mmc/host/sdhci-of.c
> index d79fa55..fb00bc5 100644
> --- a/drivers/mmc/host/sdhci-of.c
> +++ b/drivers/mmc/host/sdhci-of.c
> @@ -226,7 +226,7 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev,
> return -ENODEV;
>
> host = sdhci_alloc_host(&ofdev->dev, sizeof(*of_host));
> - if (!host)
> + if (IS_ERR(host))
> return -ENOMEM;
>
> of_host = sdhci_priv(host);

--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2