From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Wolfram Sang <w.sang@pengutronix.de>,
Alessandro Zummo <a.zummo@towertech.it>,
Thomas Gleixner <tglx@linutronix.de>,
rtc-linux@googlegroups.com
Subject: [PATCH 05/11] rtc: m41t80: Initialize clientdata before registering device
Date: Fri, 6 May 2011 18:20:48 -0700 [thread overview]
Message-ID: <1304731254-3238-6-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1304731254-3238-1-git-send-email-john.stultz@linaro.org>
Commit f44f7f96a20 ("RTC: Initialize kernel state from RTC") uncovered
an issue in a number of RTC drivers, where the drivers call
rtc_device_register before initializing the clientdata.
This frequently results in null pointer dereferences when the
rtc_device_register immediately makes use of the rtc device, calling
rtc_read_alarm.
The solution is to ensure the clientdata is initialized prior to registering
the rtc device.
CC: Wolfram Sang <w.sang@pengutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: rtc-linux@googlegroups.com
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
drivers/rtc/rtc-m41t80.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 69fe664..eda128f 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -783,6 +783,9 @@ static int m41t80_probe(struct i2c_client *client,
goto exit;
}
+ clientdata->features = id->driver_data;
+ i2c_set_clientdata(client, clientdata);
+
rtc = rtc_device_register(client->name, &client->dev,
&m41t80_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) {
@@ -792,8 +795,6 @@ static int m41t80_probe(struct i2c_client *client,
}
clientdata->rtc = rtc;
- clientdata->features = id->driver_data;
- i2c_set_clientdata(client, clientdata);
/* Make sure HT (Halt Update) bit is cleared */
rc = i2c_smbus_read_byte_data(client, M41T80_REG_ALARM_HOUR);
--
1.7.3.2.146.gca209
next prev parent reply other threads:[~2011-05-07 1:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-07 1:20 [PATCH 00/11] rtc: Fix rtc breakage found by commit f44f7f96a20 John Stultz
2011-05-07 1:20 ` [PATCH 01/11] rtc: mxc: Initialize drvdata before registering device John Stultz
2011-05-07 1:20 ` [PATCH 02/11] rtc: davinci: " John Stultz
2011-05-07 1:20 ` [PATCH 03/11] rtc: ep93xx: " John Stultz
2011-05-07 1:20 ` [PATCH 04/11] rtc: ds1286: " John Stultz
2011-05-07 1:20 ` John Stultz [this message]
2011-05-07 1:20 ` [PATCH 06/11] rtc: max8925: " John Stultz
2011-05-07 1:20 ` [PATCH 07/11] rtc: max8998: " John Stultz
2011-05-07 1:20 ` [PATCH 08/11] rtc: msm6242: " John Stultz
2011-05-07 1:20 ` [PATCH 09/11] rtc: pcap: " John Stultz
2011-05-07 1:20 ` [PATCH 10/11] rtc: rp5c01: " John Stultz
2011-05-07 1:20 ` [PATCH 11/11] rtc: mc13xxx: Don't call rtc_device_register while holding lock John Stultz
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=1304731254-3238-6-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=a.zummo@towertech.it \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
--cc=tglx@linutronix.de \
--cc=w.sang@pengutronix.de \
/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
Powered by JetHome