Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2b48012 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: ds1307: use sizeof 



Use sizeof where possible to ensure we don't read/write more than the
allocated buffer.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 042fa8c7

drivers/rtc/rtc-ds1307.c

+16 −8
Original line number Original line Diff line number Diff line
@@ -650,7 +650,8 @@ static irqreturn_t rx8130_irq(int irq, void *dev_id) 
	mutex_lock(lock);

	mutex_lock(lock);





	/* Read control registers. */

	/* 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)

	if (ret < 0)

		goto out;

		goto out;

	if (!(ctl[1] & RX8130_REG_FLAG_AF))

	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[1] &= ~RX8130_REG_FLAG_AF;

	ctl[2] &= ~RX8130_REG_CONTROL0_AIE;

	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)

	if (ret < 0)

		goto out;

		goto out;
@@ -680,12 +682,14 @@ static int rx8130_read_alarm(struct device *dev, struct rtc_wkalrm *t) 
		return -EINVAL;

		return -EINVAL;





	/* Read alarm registers. */

	/* 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)

	if (ret < 0)

		return ret;

		return ret;





	/* Read control registers. */

	/* 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)

	if (ret < 0)

		return ret;

		return ret;
@@ -726,7 +730,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t) 
		t->enabled, t->pending);

		t->enabled, t->pending);





	/* Read control registers. */

	/* 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)

	if (ret < 0)

		return ret;

		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[1] |= RX8130_REG_FLAG_AF;

	ctl[2] &= ~RX8130_REG_CONTROL0_AIE;

	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)

	if (ret < 0)

		return ret;

		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[1] = bin2bcd(t->time.tm_hour);

	ald[2] = bin2bcd(t->time.tm_mday);

	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)

	if (ret < 0)

		return ret;

		return ret;
@@ -752,7 +759,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t) 




	ctl[2] |= RX8130_REG_CONTROL0_AIE;

	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)

static int rx8130_alarm_irq_enable(struct device *dev, unsigned int enabled)