From: Stefano Manni <stefano.manni@gmail.com>
To: a.zummo@towertech.it, alexandre.belloni@free-electrons.com
Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org,
Stefano Manni <stefano.manni@gmail.com>
Subject: [PATCH] rtc: mcp795: remove VLA usage
Date: Tue, 13 Mar 2018 00:13:38 +0100 [thread overview]
Message-ID: <20180312231338.3756-1-stefano.manni@gmail.com> (raw)
In preparation to enabling -Wvla, remove VLAs and replace them with
fixed-length arrays instead.
rtc-mcp795.c uses a variable-length array declaration to contain
the command to write the rtcc; this can be replaced by a fixed-
size array of length 2 (instruction, address) + 32 (data out),
assuming a maximum data length of 32 bytes before wrap up.
This was prompted by https://lkml.org/lkml/2018/3/7/621
Signed-off-by: Stefano Manni <stefano.manni@gmail.com>
---
drivers/rtc/rtc-mcp795.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c
index 77f21331ae21..a5f504e2364c 100644
--- a/drivers/rtc/rtc-mcp795.c
+++ b/drivers/rtc/rtc-mcp795.c
@@ -61,6 +61,9 @@
#define SEC_PER_DAY (24 * 60 * 60)
+/* Maximum length for data out in write operation to RTCC */
+#define MCP795_MAX_DATAOUT_LEN 32
+
static int mcp795_rtcc_read(struct device *dev, u8 addr, u8 *buf, u8 count)
{
struct spi_device *spi = to_spi_device(dev);
@@ -82,7 +85,10 @@ static int mcp795_rtcc_write(struct device *dev, u8 addr, u8 *data, u8 count)
{
struct spi_device *spi = to_spi_device(dev);
int ret;
- u8 tx[2 + count];
+ u8 tx[2 + MCP795_MAX_DATAOUT_LEN];
+
+ if (count > MCP795_MAX_DATAOUT_LEN)
+ return -EINVAL;
tx[0] = MCP795_WRITE;
tx[1] = addr;
--
2.14.3
next reply other threads:[~2018-03-12 23:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 23:13 Stefano Manni [this message]
2018-03-12 23:31 ` [PATCH] rtc: mcp795: remove VLA usage Alexandre Belloni
2018-03-13 8:29 ` Stefano Manni
2018-03-13 16:28 ` Alexandre Belloni
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=20180312231338.3756-1-stefano.manni@gmail.com \
--to=stefano.manni@gmail.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@free-electrons.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).