2021-05-24 23:03:36

by Nizam Haider

Subject: [PATCH v2 1/2] char: pcmcia: cm4000_cs: Fix failure handling

From: Nijam Haider <[email protected]>

Handled failure cases of device_create()

Signed-off-by: Nijam Haider <[email protected]>
---
V1 -> V2: Added description and changelog
---
drivers/char/pcmcia/cm4000_cs.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 89681f07bc78..1ed4eac6b8ef 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1783,6 +1783,7 @@ static int cm4000_probe(struct pcmcia_device *link)
{
struct cm4000_dev *dev;
int i, ret;
+ struct device *dev_ret;

for (i = 0; i < CM4000_MAX_DEV; i++)
if (dev_table[i] == NULL)
@@ -1814,8 +1815,14 @@ static int cm4000_probe(struct pcmcia_device *link)
return ret;
}

- device_create(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);
-
+ dev_ret = device_create(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);
+ if (IS_ERR(dev_ret)) {
+ dev_err(&link->dev, "device_create failed for %d\n", i);
+ cm4000_release(link);
+ dev_table[i] = NULL;
+ kfree(dev);
+ return -ENODEV;
+ }
return 0;
}

--
2.7.4

2021-05-24 23:05:17

by Nizam Haider

Subject: [PATCH v2 2/2] char: pcmcia: cm4040_cs: Fix failure handling

From: Nijam Haider <[email protected]>

Handled failure cases of device_create()

Signed-off-by: Nijam Haider <[email protected]>
---
V1 -> V2: Added description and changelog
---
drivers/char/pcmcia/cm4040_cs.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index d5e43606339c..526198be91fa 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -558,6 +558,7 @@ static void reader_release(struct pcmcia_device *link)
static int reader_probe(struct pcmcia_device *link)
{
struct reader_dev *dev;
+ struct device *dev_ret;
int i, ret;

for (i = 0; i < CM_MAX_DEV; i++) {
@@ -593,8 +594,14 @@ static int reader_probe(struct pcmcia_device *link)
return ret;
}

- device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i);
-
+ dev_ret = device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i);
+ if (IS_ERR(dev_ret)) {
+ dev_err(&link->dev, "device_create failed for %d\n", i);
+ reader_release(link);
+ dev_table[i] = NULL;
+ kfree(dev);
+ return -ENODEV;
+ }
return 0;
}

--
2.7.4

2021-05-27 20:49:26

by Greg Kroah-Hartman

Subject: Re: [PATCH v2 2/2] char: pcmcia: cm4040_cs: Fix failure handling

On Tue, May 25, 2021 at 04:32:35AM +0530, [email protected] wrote:
> From: Nijam Haider <[email protected]>
>
> Handled failure cases of device_create()
>
> Signed-off-by: Nijam Haider <[email protected]>
> ---
> V1 -> V2: Added description and changelog
> ---
> drivers/char/pcmcia/cm4040_cs.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
> index d5e43606339c..526198be91fa 100644
> --- a/drivers/char/pcmcia/cm4040_cs.c
> +++ b/drivers/char/pcmcia/cm4040_cs.c
> @@ -558,6 +558,7 @@ static void reader_release(struct pcmcia_device *link)
> static int reader_probe(struct pcmcia_device *link)
> {
> struct reader_dev *dev;
> + struct device *dev_ret;
> int i, ret;
>
> for (i = 0; i < CM_MAX_DEV; i++) {
> @@ -593,8 +594,14 @@ static int reader_probe(struct pcmcia_device *link)
> return ret;
> }
>
> - device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i);
> -
> + dev_ret = device_create(cmx_class, NULL, MKDEV(major, i), NULL, "cmx%d", i);
> + if (IS_ERR(dev_ret)) {
> + dev_err(&link->dev, "device_create failed for %d\n", i);
> + reader_release(link);
> + dev_table[i] = NULL;
> + kfree(dev);
> + return -ENODEV;
> + }

Same comment as on patch 1/2.

thanks,

greg k-h

2021-05-27 20:50:02

by Greg Kroah-Hartman

Subject: Re: [PATCH v2 1/2] char: pcmcia: cm4000_cs: Fix failure handling

On Tue, May 25, 2021 at 04:32:34AM +0530, [email protected] wrote:
> From: Nijam Haider <[email protected]>
>
> Handled failure cases of device_create()
>
> Signed-off-by: Nijam Haider <[email protected]>
> ---
> V1 -> V2: Added description and changelog
> ---
> drivers/char/pcmcia/cm4000_cs.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
> index 89681f07bc78..1ed4eac6b8ef 100644
> --- a/drivers/char/pcmcia/cm4000_cs.c
> +++ b/drivers/char/pcmcia/cm4000_cs.c
> @@ -1783,6 +1783,7 @@ static int cm4000_probe(struct pcmcia_device *link)
> {
> struct cm4000_dev *dev;
> int i, ret;
> + struct device *dev_ret;
>
> for (i = 0; i < CM4000_MAX_DEV; i++)
> if (dev_table[i] == NULL)
> @@ -1814,8 +1815,14 @@ static int cm4000_probe(struct pcmcia_device *link)
> return ret;
> }
>
> - device_create(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);
> -
> + dev_ret = device_create(cmm_class, NULL, MKDEV(major, i), NULL, "cmm%d", i);
> + if (IS_ERR(dev_ret)) {
> + dev_err(&link->dev, "device_create failed for %d\n", i);
> + cm4000_release(link);
> + dev_table[i] = NULL;
> + kfree(dev);
> + return -ENODEV;
> + }

As before, make different err_*: labels and jump to them when cleaning
up.

thanks,

greg k-h