rtc: ds1307: use sizeof
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Mon, 4 Sep 2017 20:46:03 +0000 (22:46 +0200)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Tue, 5 Sep 2017 07:55:03 +0000 (09:55 +0200)
Use sizeof where possible to ensure we don't read/write more than the
allocated buffer.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-ds1307.c

index 8de1d71..93fb084 100644 (file)
@@ -650,7 +650,8 @@ static irqreturn_t rx8130_irq(int irq, void *dev_id)
        mutex_lock(lock);
 
        /* Read control registers. */
-       ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);
+       ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl,
+                              sizeof(ctl));
        if (ret < 0)
                goto out;
        if (!(ctl[1] & RX8130_REG_FLAG_AF))
@@ -658,7 +659,8 @@ static irqreturn_t rx8130_irq(int irq, void *dev_id)
        ctl[1] &= ~RX8130_REG_FLAG_AF;
        ctl[2] &= ~RX8130_REG_CONTROL0_AIE;
 
-       ret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);
+       ret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl,
+                               sizeof(ctl));
        if (ret < 0)
                goto out;
 
@@ -680,12 +682,14 @@ static int rx8130_read_alarm(struct device *dev, struct rtc_wkalrm *t)
                return -EINVAL;
 
        /* Read alarm registers. */
-       ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_ALARM_MIN, ald, 3);
+       ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_ALARM_MIN, ald,
+                              sizeof(ald));
        if (ret < 0)
                return ret;
 
        /* Read control registers. */
-       ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);
+       ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl,
+                              sizeof(ctl));
        if (ret < 0)
                return ret;
 
@@ -726,7 +730,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)
                t->enabled, t->pending);
 
        /* Read control registers. */
-       ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);
+       ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl,
+                              sizeof(ctl));
        if (ret < 0)
                return ret;
 
@@ -734,7 +739,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)
        ctl[1] |= RX8130_REG_FLAG_AF;
        ctl[2] &= ~RX8130_REG_CONTROL0_AIE;
 
-       ret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);
+       ret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl,
+                               sizeof(ctl));
        if (ret < 0)
                return ret;
 
@@ -743,7 +749,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)
        ald[1] = bin2bcd(t->time.tm_hour);
        ald[2] = bin2bcd(t->time.tm_mday);
 
-       ret = regmap_bulk_write(ds1307->regmap, RX8130_REG_ALARM_MIN, ald, 3);
+       ret = regmap_bulk_write(ds1307->regmap, RX8130_REG_ALARM_MIN, ald,
+                               sizeof(ald));
        if (ret < 0)
                return ret;
 
@@ -752,7 +759,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)
 
        ctl[2] |= RX8130_REG_CONTROL0_AIE;
 
-       return regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);
+       return regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl,
+                                sizeof(ctl));
 }
 
 static int rx8130_alarm_irq_enable(struct device *dev, unsigned int enabled)