Skip to contentSkip to conversation

powerpc/powernv: add NULL check after kzalloc in opal_add_one_export

PATCH Superseded Qiujun Huang 2 participants 3 messages Apr 5, 2020 PowerPC

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

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

Here needs a NULL check.

Issue found by coccinelle.

---
 arch/powerpc/platforms/powernv/opal.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/platforms/powernv/opal.c +4 -1
index 2b3dfd0b6cdd..5b98c98817aa 100644
@@ -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;
Signature · 1 line
2.17.1
#1 lore raw

Le 05/04/2020 à 12:30, Qiujun Huang a écrit :

Quoted 14 lines

Here needs a NULL check.

Issue found by coccinelle.

---
  arch/powerpc/platforms/powernv/opal.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/platforms/powernv/opal.c +0 -0
index 2b3dfd0b6cdd..5b98c98817aa 100644

arch/powerpc/platforms/powernv/opal.c static int opal_add_one_export(struct kobject *parent, const char *export_name, · line 811

Quoted 5 lines
arch/powerpc/platforms/powernv/opal.c +1 -1
@@ -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.

arch/powerpc/platforms/powernv/opal.c static int opal_add_one_export(struct kobject *parent, const char *export_name,

Quoted 9 lines
arch/powerpc/platforms/powernv/opal.c +3 -0
  	attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+	if (!attr)
+		return -ENOMEM;
+
  	name = kstrdup(export_name, GFP_KERNEL);
  	if (!name) {
  		rc = -ENOMEM;
 

Christophe

#2 lore raw
Quoted 26 lines · Christophe Leroy
Quoted 14 lines · Qiujun Huang

Here needs a NULL check.

Issue found by coccinelle.

---
  arch/powerpc/platforms/powernv/opal.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/platforms/powernv/opal.c +0 -0
index 2b3dfd0b6cdd..5b98c98817aa 100644

arch/powerpc/platforms/powernv/opal.c static int opal_add_one_export(struct kobject *parent, const char *export_name, · line 811

Quoted 5 lines
arch/powerpc/platforms/powernv/opal.c +1 -1
@@ -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.

Quoted 2 lines

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 12 lines

arch/powerpc/platforms/powernv/opal.c static int opal_add_one_export(struct kobject *parent, const char *export_name,

Quoted 10 lines
arch/powerpc/platforms/powernv/opal.c +3 -0
      attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+     if (!attr)
+             return -ENOMEM;
+
      name = kstrdup(export_name, GFP_KERNEL);
      if (!name) {
              rc = -ENOMEM;
 

Christophe