{"id":809839,"url":"http://patchwork.ozlabs.org/api/patches/809839/?format=json","web_url":"http://patchwork.ozlabs.org/project/rtc-linux/patch/20170904204608.7090-2-alexandre.belloni@free-electrons.com/","project":{"id":9,"url":"http://patchwork.ozlabs.org/api/projects/9/?format=json","name":"Linux RTC development","link_name":"rtc-linux","list_id":"linux-rtc.vger.kernel.org","list_email":"linux-rtc@vger.kernel.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170904204608.7090-2-alexandre.belloni@free-electrons.com>","list_archive_url":null,"date":"2017-09-04T20:46:03","name":"[2/7] rtc: ds1307: use sizeof","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8159a40b5d7d43827a07008572369db29db37898","submitter":{"id":26276,"url":"http://patchwork.ozlabs.org/api/people/26276/?format=json","name":"Alexandre Belloni","email":"alexandre.belloni@free-electrons.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/rtc-linux/patch/20170904204608.7090-2-alexandre.belloni@free-electrons.com/mbox/","series":[{"id":1455,"url":"http://patchwork.ozlabs.org/api/series/1455/?format=json","web_url":"http://patchwork.ozlabs.org/project/rtc-linux/list/?series=1455","date":"2017-09-04T20:46:03","name":"[1/7] rtc: ds1307: remove regs member","version":1,"mbox":"http://patchwork.ozlabs.org/series/1455/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809839/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809839/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-rtc-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmMMG2htRz9sRm\n\tfor ;\n\tTue, 5 Sep 2017 06:46:18 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754037AbdIDUqR (ORCPT );\n\tMon, 4 Sep 2017 16:46:17 -0400","from mail.free-electrons.com ([62.4.15.54]:53958 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754020AbdIDUqN (ORCPT\n\t); Mon, 4 Sep 2017 16:46:13 -0400","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 1E8032089B; Mon, 4 Sep 2017 22:46:10 +0200 (CEST)","from localhost (unknown [88.191.26.124])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id F164020859;\n\tMon, 4 Sep 2017 22:46:09 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","From":"Alexandre Belloni ","To":"linux-rtc@vger.kernel.org","Cc":"linux-kernel@vger.kernel.org, Heiner Kallweit ,\n\tAlexandre Belloni ","Subject":"[PATCH 2/7] rtc: ds1307: use sizeof","Date":"Mon, 4 Sep 2017 22:46:03 +0200","Message-Id":"<20170904204608.7090-2-alexandre.belloni@free-electrons.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170904204608.7090-1-alexandre.belloni@free-electrons.com>","References":"<20170904204608.7090-1-alexandre.belloni@free-electrons.com>","Sender":"linux-rtc-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-rtc@vger.kernel.org"},"content":"Use sizeof where possible to ensure we don't read/write more than the\nallocated buffer.\n\nSigned-off-by: Alexandre Belloni \n---\n drivers/rtc/rtc-ds1307.c | 24 ++++++++++++++++--------\n 1 file changed, 16 insertions(+), 8 deletions(-)","diff":"diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c\nindex 8de1d7116461..93fb08452159 100644\n--- a/drivers/rtc/rtc-ds1307.c\n+++ b/drivers/rtc/rtc-ds1307.c\n@@ -650,7 +650,8 @@ static irqreturn_t rx8130_irq(int irq, void *dev_id)\n \tmutex_lock(lock);\n \n \t/* Read control registers. */\n-\tret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);\n+\tret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl,\n+\t\t\t sizeof(ctl));\n \tif (ret < 0)\n \t\tgoto out;\n \tif (!(ctl[1] & RX8130_REG_FLAG_AF))\n@@ -658,7 +659,8 @@ static irqreturn_t rx8130_irq(int irq, void *dev_id)\n \tctl[1] &= ~RX8130_REG_FLAG_AF;\n \tctl[2] &= ~RX8130_REG_CONTROL0_AIE;\n \n-\tret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);\n+\tret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl,\n+\t\t\t\tsizeof(ctl));\n \tif (ret < 0)\n \t\tgoto out;\n \n@@ -680,12 +682,14 @@ static int rx8130_read_alarm(struct device *dev, struct rtc_wkalrm *t)\n \t\treturn -EINVAL;\n \n \t/* Read alarm registers. */\n-\tret = regmap_bulk_read(ds1307->regmap, RX8130_REG_ALARM_MIN, ald, 3);\n+\tret = regmap_bulk_read(ds1307->regmap, RX8130_REG_ALARM_MIN, ald,\n+\t\t\t sizeof(ald));\n \tif (ret < 0)\n \t\treturn ret;\n \n \t/* Read control registers. */\n-\tret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);\n+\tret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl,\n+\t\t\t sizeof(ctl));\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -726,7 +730,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)\n \t\tt->enabled, t->pending);\n \n \t/* Read control registers. */\n-\tret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);\n+\tret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl,\n+\t\t\t sizeof(ctl));\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -734,7 +739,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)\n \tctl[1] |= RX8130_REG_FLAG_AF;\n \tctl[2] &= ~RX8130_REG_CONTROL0_AIE;\n \n-\tret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);\n+\tret = regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl,\n+\t\t\t\tsizeof(ctl));\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -743,7 +749,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)\n \tald[1] = bin2bcd(t->time.tm_hour);\n \tald[2] = bin2bcd(t->time.tm_mday);\n \n-\tret = regmap_bulk_write(ds1307->regmap, RX8130_REG_ALARM_MIN, ald, 3);\n+\tret = regmap_bulk_write(ds1307->regmap, RX8130_REG_ALARM_MIN, ald,\n+\t\t\t\tsizeof(ald));\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -752,7 +759,8 @@ static int rx8130_set_alarm(struct device *dev, struct rtc_wkalrm *t)\n \n \tctl[2] |= RX8130_REG_CONTROL0_AIE;\n \n-\treturn regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl, 3);\n+\treturn regmap_bulk_write(ds1307->regmap, RX8130_REG_EXTENSION, ctl,\n+\t\t\t\t sizeof(ctl));\n }\n \n static int rx8130_alarm_irq_enable(struct device *dev, unsigned int enabled)\n","prefixes":["2/7"]}