* [PATCH v2 1/2] char: pcmcia: cm4000_cs: Fix failure handling
@ 2021-05-24 23:02 nizamhaider786
2021-05-24 23:02 ` [PATCH v2 2/2] char: pcmcia: cm4040_cs: " nizamhaider786
2021-05-27 12:45 ` [PATCH v2 1/2] char: pcmcia: cm4000_cs: " Greg KH
0 siblings, 2 replies; 4+ messages in thread
From: nizamhaider786 @ 2021-05-24 23:02 UTC (permalink / raw)
To: laforge; +Cc: arnd, gregkh, linux-kernel, Nijam Haider
From: Nijam Haider <nizamhaider786@gmail.com>
Handled failure cases of device_create()
Signed-off-by: Nijam Haider <nizamhaider786@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 2/2] char: pcmcia: cm4040_cs: Fix failure handling
2021-05-24 23:02 [PATCH v2 1/2] char: pcmcia: cm4000_cs: Fix failure handling nizamhaider786
@ 2021-05-24 23:02 ` nizamhaider786
2021-05-27 12:45 ` Greg KH
2021-05-27 12:45 ` [PATCH v2 1/2] char: pcmcia: cm4000_cs: " Greg KH
1 sibling, 1 reply; 4+ messages in thread
From: nizamhaider786 @ 2021-05-24 23:02 UTC (permalink / raw)
To: laforge; +Cc: arnd, gregkh, linux-kernel, Nijam Haider
From: Nijam Haider <nizamhaider786@gmail.com>
Handled failure cases of device_create()
Signed-off-by: Nijam Haider <nizamhaider786@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2 2/2] char: pcmcia: cm4040_cs: Fix failure handling
2021-05-24 23:02 ` [PATCH v2 2/2] char: pcmcia: cm4040_cs: " nizamhaider786
@ 2021-05-27 12:45 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-05-27 12:45 UTC (permalink / raw)
To: nizamhaider786; +Cc: laforge, arnd, linux-kernel
On Tue, May 25, 2021 at 04:32:35AM +0530, nizamhaider786@gmail.com wrote:
> From: Nijam Haider <nizamhaider786@gmail.com>
>
> Handled failure cases of device_create()
>
> Signed-off-by: Nijam Haider <nizamhaider786@gmail.com>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] char: pcmcia: cm4000_cs: Fix failure handling
2021-05-24 23:02 [PATCH v2 1/2] char: pcmcia: cm4000_cs: Fix failure handling nizamhaider786
2021-05-24 23:02 ` [PATCH v2 2/2] char: pcmcia: cm4040_cs: " nizamhaider786
@ 2021-05-27 12:45 ` Greg KH
1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-05-27 12:45 UTC (permalink / raw)
To: nizamhaider786; +Cc: laforge, arnd, linux-kernel
On Tue, May 25, 2021 at 04:32:34AM +0530, nizamhaider786@gmail.com wrote:
> From: Nijam Haider <nizamhaider786@gmail.com>
>
> Handled failure cases of device_create()
>
> Signed-off-by: Nijam Haider <nizamhaider786@gmail.com>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-27 12:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-24 23:02 [PATCH v2 1/2] char: pcmcia: cm4000_cs: Fix failure handling nizamhaider786
2021-05-24 23:02 ` [PATCH v2 2/2] char: pcmcia: cm4040_cs: " nizamhaider786
2021-05-27 12:45 ` Greg KH
2021-05-27 12:45 ` [PATCH v2 1/2] char: pcmcia: cm4000_cs: " Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.