Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1563575

[PATCH] power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference

Show all headers | View raw

From: Colin Ian King <colin.king@canonical.com>

acpi_match_device can potentially return NULL, so it is prudent to
check if acpi_id is null before it is dereferenced.  Add a check
and an error message to indicate the failure.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/power/supply/bq2415x_charger.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/power/supply/bq2415x_charger.c b/drivers/power/supply/bq2415x_charger.c
index 73e2f0b..c4770a9 100644
--- a/drivers/power/supply/bq2415x_charger.c
+++ b/drivers/power/supply/bq2415x_charger.c
@@ -1569,6 +1569,11 @@ static int bq2415x_probe(struct i2c_client *client,
 		acpi_id =
 			acpi_match_device(client->dev.driver->acpi_match_table,
 					  &client->dev);
+		if (!acpi_id) {
+			dev_err(&client->dev, "failed to match device name\n");
+			ret = -ENODEV;
+			goto error_1;
+		}
 		name = kasprintf(GFP_KERNEL, "%s-%d", acpi_id->id, num);
 	}
 	if (!name) {
-- 
2.10.2

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference Colin King <colin.king@canonical.com> - 2017-01-20 14:30 +0100
  Re: [PATCH] power: supply: bq2415x: check for NULL acpi_id to avoid  null pointer dereference Pali Rohár <pali.rohar@gmail.com> - 2017-01-21 01:10 +0100
  Re: [PATCH] power: supply: bq2415x: check for NULL acpi_id to avoid  null pointer dereference Sebastian Reichel <sre@kernel.org> - 2017-01-29 16:30 +0100

csiph-web