[PATCH v2] powerpc/powernv: add NULL check after kzalloc in opal_add_one_export

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE2308d

3 messages, 2 authors, 2020-04-05 · open the first message on its own page

[PATCH v2] powerpc/powernv: add NULL check after kzalloc in opal_add_one_export

From: Qiujun Huang <hidden>
Date: 2020-04-05 10:31:09

Here needs a NULL check.

Issue found by coccinelle.

Signed-off-by: Qiujun Huang <redacted>
---
 arch/powerpc/platforms/powernv/opal.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 2b3dfd0b6cdd..5b98c98817aa 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -808,9 +808,12 @@ static int opal_add_one_export(struct kobject *parent, const char *export_name,
 
 	rc = of_property_read_u64_array(np, prop_name, &vals[0], 2);
 	if (rc)
-		goto out;
+		return rc;
 
 	attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+	if (!attr)
+		return -ENOMEM;
+
 	name = kstrdup(export_name, GFP_KERNEL);
 	if (!name) {
 		rc = -ENOMEM;
-- 
2.17.1

Re: [PATCH v2] powerpc/powernv: add NULL check after kzalloc in opal_add_one_export

From: Christophe Leroy <hidden>
Date: 2020-04-05 12:12:47


Le 05/04/2020 à 12:30, Qiujun Huang a écrit :
quoted hunk
Here needs a NULL check.

Issue found by coccinelle.

Signed-off-by: Qiujun Huang <redacted>
---
  arch/powerpc/platforms/powernv/opal.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 2b3dfd0b6cdd..5b98c98817aa 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -808,9 +808,12 @@ static int opal_add_one_export(struct kobject *parent, const char *export_name,
  
  	rc = of_property_read_u64_array(np, prop_name, &vals[0], 2);
  	if (rc)
-		goto out;
+		return rc;
Nice you changed that too.

Then there is no need the initialise attr and name to NULL in their 
declaration, as they won't be used before they are assigned.
  
  	attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+	if (!attr)
+		return -ENOMEM;
+
  	name = kstrdup(export_name, GFP_KERNEL);
  	if (!name) {
  		rc = -ENOMEM;
Christophe

Re: [PATCH v2] powerpc/powernv: add NULL check after kzalloc in opal_add_one_export

From: Qiujun Huang <hidden>
Date: 2020-04-05 12:20:24

On Sun, Apr 5, 2020 at 8:12 PM Christophe Leroy [off-list ref] wrote:


Le 05/04/2020 à 12:30, Qiujun Huang a écrit :
quoted
Here needs a NULL check.

Issue found by coccinelle.

Signed-off-by: Qiujun Huang <redacted>
---
  arch/powerpc/platforms/powernv/opal.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 2b3dfd0b6cdd..5b98c98817aa 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -808,9 +808,12 @@ static int opal_add_one_export(struct kobject *parent, const char *export_name,

      rc = of_property_read_u64_array(np, prop_name, &vals[0], 2);
      if (rc)
-             goto out;
+             return rc;
Nice you changed that too.

Then there is no need the initialise attr and name to NULL in their
declaration, as they won't be used before they are assigned.
So that's it.
quoted
      attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+     if (!attr)
+             return -ENOMEM;
+
      name = kstrdup(export_name, GFP_KERNEL);
      if (!name) {
              rc = -ENOMEM;
Christophe
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help