Skip to contentSkip to conversation

mfd: fix a potential NULL pointer dereference

PATCH In review Kangjie Lu 3 participants 5 messages Mar 9, 2019 – Apr 2, 2019 Multifunction devices (MFD)

lore
Share & tools
lore

Kangjie Lu

author
#0 lore raw

PATCH 1/1 mfd: fix a potential NULL pointer dereference

In case devm_kzalloc fails, the fix does NULL check and returns -ENOMEM upon failure so as to avoid NULL pointer dereference.

---
 drivers/mfd/sm501.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/mfd/sm501.c +3 -0
index a530972c5a7e..e0173bf4b0dc 100644
@@ -1145,6 +1145,9 @@ static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,
 	lookup = devm_kzalloc(&pdev->dev,
 			      sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),
 			      GFP_KERNEL);
+	if (!lookup)
+		return -ENOMEM;
+
 	lookup->dev_id = "i2c-gpio";
 	if (iic->pin_sda < 32)
 		lookup->table[0].chip_label = "SM501-LOW";
Signature · 1 line
2.17.1
author
#1 lore raw

Hi Lee Jones,

Can you review this patch?

Thanks.

Quoted 27 lines · Kangjie Lu

In case devm_kzalloc fails, the fix does NULL check and returns -ENOMEM upon failure so as to avoid NULL pointer dereference.

---
drivers/mfd/sm501.c | 3 +++

1 file changed, 3 insertions(+)
drivers/mfd/sm501.c +3 -0
index a530972c5a7e..e0173bf4b0dc 100644
@@ -1145,6 +1145,9 @@ static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,
 	lookup = devm_kzalloc(&pdev->dev,
 			      sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),
 			      GFP_KERNEL);
+	if (!lookup)
+		return -ENOMEM;
+
 	lookup->dev_id = "i2c-gpio";
 	if (iic->pin_sda < 32)
 		lookup->table[0].chip_label = "SM501-LOW";
Signature · 1 line
2.17.1
#2 lore raw
Quoted 3 lines · Kangjie Lu

Hi Lee Jones,

Can you review this patch?

Don't poke.

I have a very long list of reviews on my TODO. Poking only surfaces your patch to the top of my Inbox, and since I review patches in reverse chronological order, it puts the review to the back of the queue.

Quoted 25 lines
Quoted 24 lines · Kangjie Lu

In case devm_kzalloc fails, the fix does NULL check and returns -ENOMEM upon failure so as to avoid NULL pointer dereference.

---
drivers/mfd/sm501.c | 3 +++

1 file changed, 3 insertions(+)
drivers/mfd/sm501.c +3 -0
index a530972c5a7e..e0173bf4b0dc 100644
@@ -1145,6 +1145,9 @@ static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,
 	lookup = devm_kzalloc(&pdev->dev,
 			      sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),
 			      GFP_KERNEL);
+	if (!lookup)
+		return -ENOMEM;
+
 	lookup->dev_id = "i2c-gpio";
 	if (iic->pin_sda < 32)
 		lookup->table[0].chip_label = "SM501-LOW";
Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw
Quoted 22 lines · Lee Jones
Quoted 3 lines · Kangjie Lu

Hi Lee Jones,

Can you review this patch?

Don't poke.

I have a very long list of reviews on my TODO. Poking only surfaces your patch to the top of my Inbox, and since I review patches in reverse chronological order, it puts the review to the back of the queue.

Quoted 10 lines
Quoted 10 lines · Kangjie Lu

In case devm_kzalloc fails, the fix does NULL check and returns -ENOMEM upon failure so as to avoid NULL pointer dereference.

---
drivers/mfd/sm501.c | 3 +++

1 file changed, 3 insertions(+)
Quoted 10 lines
Quoted 10 lines

drivers/mfd/sm501.c static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm, · line 1149

Quoted 10 lines
drivers/mfd/sm501.c +2 -0
index a530972c5a7e..e0173bf4b0dc 100644
@@ -1145,6 +1145,9 @@ static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,
 	lookup = devm_kzalloc(&pdev->dev,
 			      sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),
 			      GFP_KERNEL);
+	if (!lookup)
+		return -ENOMEM;

Seems you are using quite old codebase.
This patch is already there ..

https://elixir.bootlin.com/linux/v5.1-rc2/source/drivers/mfd/sm501.c#L1147

commit ae7b8eda27b3( mfd: sm501: Fix potential NULL pointer dereference )

Thanks,
Mukesh

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/mfd/sm501.c +1 -0
+
 	lookup->dev_id = "i2c-gpio";
 	if (iic->pin_sda < 32)
 		lookup->table[0].chip_label = "SM501-LOW";
#4 lore raw
Quoted 37 lines · Mukesh Ojha
Quoted 22 lines · Lee Jones
Quoted 3 lines · Kangjie Lu

Hi Lee Jones,

Can you review this patch?

Don't poke.

I have a very long list of reviews on my TODO. Poking only surfaces your patch to the top of my Inbox, and since I review patches in reverse chronological order, it puts the review to the back of the queue.

Quoted 10 lines
Quoted 10 lines · Kangjie Lu

In case devm_kzalloc fails, the fix does NULL check and returns -ENOMEM upon failure so as to avoid NULL pointer dereference.

---
drivers/mfd/sm501.c | 3 +++

1 file changed, 3 insertions(+)
Quoted 10 lines
Quoted 10 lines

drivers/mfd/sm501.c static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm, · line 1149

Quoted 10 lines
drivers/mfd/sm501.c +2 -0
index a530972c5a7e..e0173bf4b0dc 100644
@@ -1145,6 +1145,9 @@ static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,
 	lookup = devm_kzalloc(&pdev->dev,
 			      sizeof(*lookup) + 3 * sizeof(struct gpiod_lookup),
 			      GFP_KERNEL);
+	if (!lookup)
+		return -ENOMEM;

Seems you are using quite old codebase.
This patch is already there ..

Quoted 3 lines

https://elixir.bootlin.com/linux/v5.1-rc2/source/drivers/mfd/sm501.c#L1147

commit ae7b8eda27b3( mfd: sm501: Fix potential NULL pointer dereference )

Confirmed. Dropping this one.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog