[PATCH] POWER: jz4740-battery: Check if platform_data is supplied

From: Lars-Peter Clausen
Date: Thu Nov 11 2010 - 13:01:20 EST


Currently platform_data is dereferenced without checking whether it is actually
set, which can lead to kernel crashes.
This patch adds a check which will abort the drivers probe function gracefully
if no platform_data is supplied.

Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
---
drivers/power/jz4740-battery.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index 2bbe04a..5b48215 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -246,6 +246,11 @@ static int __devinit jz_battery_probe(struct platform_device *pdev)
struct jz_battery *jz_battery;
struct power_supply *battery;

+ if (!pdata) {
+ dev_err(&pdev->dev, "No platform_data supplied\n");
+ return -ENXIO;
+ }
+
jz_battery = kzalloc(sizeof(*jz_battery), GFP_KERNEL);
if (!jz_battery) {
dev_err(&pdev->dev, "Failed to allocate driver structure\n");
--
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/