[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20101004015056.GA22095@hrair>
Date: Sun, 3 Oct 2010 18:50:56 -0700
From: Brian Harring <ferringb@...il.com>
To: linux-kernel@...r.kernel.org
Cc: sameo@...ux.intel.com, richard.rojfors@...agicore.com
Subject: [PATCH] add platform_data only if non NULL
If a NULL or 0 size platform_data is added, the underlying dup results in a pointer into nullspace- meaning drivers can't do null checks for platform_data.
This fixes an oops during probing for drivers/net/ks8842, and drivers/mmc/host/sdhci-pltform when the mfd is timberdale
Signed-off-by: Brian Harring <ferringb@...il.com>
---
drivers/mfd/mfd-core.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 1823a57..eee73a8 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -38,10 +38,15 @@ static int mfd_add_device(struct device *parent, int id,
pdev->dev.parent = parent;
platform_set_drvdata(pdev, cell->driver_data);
- ret = platform_device_add_data(pdev,
- cell->platform_data, cell->data_size);
- if (ret)
- goto fail_res;
+ if (cell->data_size) {
+ ret = platform_device_add_data(pdev,
+ cell->platform_data, cell->data_size);
+ if (ret)
+ goto fail_res;
+ } else {
+ /* potentially nulled already, just being paranoid. */
+ pdev->dev.platform_data = NULL;
+ }
for (r = 0; r < cell->num_resources; r++) {
res[r].name = cell->resources[r].name;
--
1.7.2
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists