Subject: + drivers-rtc-rtc-ds1343c-fix-potential-race-condition.patch added to -mm tree
To: ravi23ganiga@xxxxxxxxx,a.zummo@xxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 19 May 2014 14:33:15 -0700
The patch titled
Subject: drivers/rtc/rtc-ds1343.c: fix potential race condition
has been added to the -mm tree. Its filename is
drivers-rtc-rtc-ds1343c-fix-potential-race-condition.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/drivers-rtc-rtc-ds1343c-fix-potential-race-condition.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/drivers-rtc-rtc-ds1343c-fix-potential-race-condition.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Raghavendra Ganiga <ravi23ganiga@xxxxxxxxx>
Subject: drivers/rtc/rtc-ds1343.c: fix potential race condition
Avoid the potential race condition by avoiding bailing out of driver in
probe after registering with rtc subsystem
Also the set_alarm , read_alarm and alarm_irq_enable returns error if irq
registration fails in probe.
Also the sysfs will not create entry for alarm if irq registration fails
in probe.
Signed-off-by: Raghavendra Chandra Ganiga <ravi23ganiga@xxxxxxxxx>
Acked-by: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-ds1343.c | 38 +++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff -puN drivers/rtc/rtc-ds1343.c~drivers-rtc-rtc-ds1343c-fix-potential-race-condition drivers/rtc/rtc-ds1343.c
--- a/drivers/rtc/rtc-ds1343.c~drivers-rtc-rtc-ds1343c-fix-potential-race-condition
+++ a/drivers/rtc/rtc-ds1343.c
@@ -80,6 +80,7 @@ struct ds1343_priv {
struct regmap *map;
struct mutex mutex;
unsigned int irqen;
+ int irq;
int alarm_sec;
int alarm_min;
int alarm_hour;
@@ -262,28 +263,32 @@ static DEVICE_ATTR(trickle_charger, S_IR
static int ds1343_sysfs_register(struct device *dev)
{
+ struct ds1343_priv *priv = dev_get_drvdata(dev);
int err;
err = device_create_file(dev, &dev_attr_glitch_filter);
if (err)
return err;
- err = device_create_file(dev, &dev_attr_alarm_status);
+ err = device_create_file(dev, &dev_attr_trickle_charger);
if (err)
goto error1;
+ if (priv->irq <= 0)
+ return err;
+
err = device_create_file(dev, &dev_attr_alarm_mode);
if (err)
goto error2;
- err = device_create_file(dev, &dev_attr_trickle_charger);
+ err = device_create_file(dev, &dev_attr_alarm_status);
if (!err)
return err;
device_remove_file(dev, &dev_attr_alarm_mode);
error2:
- device_remove_file(dev, &dev_attr_alarm_status);
+ device_remove_file(dev, &dev_attr_trickle_charger);
error1:
device_remove_file(dev, &dev_attr_glitch_filter);
@@ -293,10 +298,16 @@ error1:
static void ds1343_sysfs_unregister(struct device *dev)
{
+ struct ds1343_priv *priv = dev_get_drvdata(dev);
+
device_remove_file(dev, &dev_attr_glitch_filter);
+ device_remove_file(dev, &dev_attr_trickle_charger);
+
+ if (priv->irq <= 0)
+ return;
+
device_remove_file(dev, &dev_attr_alarm_status);
device_remove_file(dev, &dev_attr_alarm_mode);
- device_remove_file(dev, &dev_attr_trickle_charger);
}
static int ds1343_read_time(struct device *dev, struct rtc_time *dt)
@@ -415,11 +426,10 @@ static int ds1343_update_alarm(struct de
static int ds1343_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{
struct ds1343_priv *priv = dev_get_drvdata(dev);
- struct spi_device *spi = priv->spi;
int res = 0;
unsigned int stat;
- if (spi->irq <= 0)
+ if (priv->irq <= 0)
return -EINVAL;
mutex_lock(&priv->mutex);
@@ -450,10 +460,9 @@ out:
static int ds1343_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{
struct ds1343_priv *priv = dev_get_drvdata(dev);
- struct spi_device *spi = priv->spi;
int res = 0;
- if (spi->irq <= 0)
+ if (priv->irq <= 0)
return -EINVAL;
mutex_lock(&priv->mutex);
@@ -476,10 +485,9 @@ static int ds1343_set_alarm(struct devic
static int ds1343_alarm_irq_enable(struct device *dev, unsigned int enabled)
{
struct ds1343_priv *priv = dev_get_drvdata(dev);
- struct spi_device *spi = priv->spi;
int res = 0;
- if (spi->irq <= 0)
+ if (priv->irq <= 0)
return -EINVAL;
mutex_lock(&priv->mutex);
@@ -593,18 +601,20 @@ static int ds1343_probe(struct spi_devic
return PTR_ERR(priv->rtc);
}
- if (spi->irq >= 0) {
+ priv->irq = spi->irq;
+
+ if (priv->irq >= 0) {
res = devm_request_threaded_irq(&spi->dev, spi->irq, NULL,
ds1343_thread,
IRQF_NO_SUSPEND | IRQF_ONESHOT,
"ds1343", priv);
if (res) {
+ priv->irq = -1;
dev_err(&spi->dev,
"unable to request irq for rtc ds1343\n");
- return res;
+ } else {
+ device_set_wakeup_capable(&spi->dev, 1);
}
-
- device_set_wakeup_capable(&spi->dev, 1);
}
res = ds1343_sysfs_register(&spi->dev);
_
Patches currently in -mm which might be from ravi23ganiga@xxxxxxxxx are
drivers-rtc-add-support-for-maxim-dallas-rtc-ds1343-and-ds1344.patch
rtc-fix-potential-race-condition-and-remove-build-errors.patch
drivers-rtc-rtc-ds1343c-fix-potential-race-condition.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
