mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: linux-kernel@vger.kernel.org, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH] POWER: jz4740-battery: Check if platform_data is supplied
Date: Thu, 11 Nov 2010 19:00:53 +0100	[thread overview]
Message-ID: <1289498453-9938-2-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1289498453-9938-1-git-send-email-lars@metafoo.de>

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@metafoo.de>
---
 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


  reply	other threads:[~2010-11-11 18:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-11 18:00 [PATCH] POWER: jz4740-battery: Protect against concurrent battery readings Lars-Peter Clausen
2010-11-11 18:00 ` Lars-Peter Clausen [this message]
2010-11-18 13:59   ` [PATCH] POWER: jz4740-battery: Check if platform_data is supplied Anton Vorontsov
2010-11-18 13:59 ` [PATCH] POWER: jz4740-battery: Protect against concurrent battery readings Anton Vorontsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1289498453-9938-2-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=cbouatmailru@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®