From: Sascha Hauer <s.hauer@pengutronix.de>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/4] nvmem: rave-sp-eeprom: Remove VLA usage
Date: Thu, 5 Jul 2018 08:15:42 +0200 [thread overview]
Message-ID: <20180705061542.tq7dgyk2cigqwgfw@pengutronix.de> (raw)
In-Reply-To: <20180704041024.32569-1-andrew.smirnov@gmail.com>
On Tue, Jul 03, 2018 at 09:10:21PM -0700, Andrey Smirnov wrote:
> This is a backport of patch [1] by Kees Cook
>
> [1] https://lkml.kernel.org/r/20180620182600.GA24297@beast
>
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
Applied, thanks
Sascha
> drivers/nvmem/rave-sp-eeprom.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvmem/rave-sp-eeprom.c b/drivers/nvmem/rave-sp-eeprom.c
> index 5fd429f16..ff91f39f7 100644
> --- a/drivers/nvmem/rave-sp-eeprom.c
> +++ b/drivers/nvmem/rave-sp-eeprom.c
> @@ -55,6 +55,7 @@ enum rave_sp_eeprom_header_size {
> RAVE_SP_EEPROM_HEADER_SMALL = 4U,
> RAVE_SP_EEPROM_HEADER_BIG = 5U,
> };
> +#define RAVE_SP_EEPROM_HEADER_MAX RAVE_SP_EEPROM_HEADER_BIG
>
> #define RAVE_SP_EEPROM_PAGE_SIZE 32U
>
> @@ -115,9 +116,12 @@ static int rave_sp_eeprom_io(struct rave_sp_eeprom *eeprom,
> const unsigned int rsp_size =
> is_write ? sizeof(*page) - sizeof(page->data) : sizeof(*page);
> unsigned int offset = 0;
> - u8 cmd[cmd_size];
> + u8 cmd[RAVE_SP_EEPROM_HEADER_MAX + sizeof(page->data)];
> int ret;
>
> + if (WARN_ON(cmd_size > sizeof(cmd)))
> + return -EINVAL;
> +
> cmd[offset++] = eeprom->address;
> cmd[offset++] = 0;
> cmd[offset++] = type;
> --
> 2.17.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2018-07-05 6:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 4:10 Andrey Smirnov
2018-07-04 4:10 ` [PATCH 2/4] nvmem: rave-sp-eeprom: Add support for "zii,eeprom-name" Andrey Smirnov
2018-07-04 4:10 ` [PATCH 3/4] ARM: dts: rdu1: Make use of "zii,eeprom-name" Andrey Smirnov
2018-07-04 4:10 ` [PATCH 4/4] ARM: dts: rdu2: " Andrey Smirnov
2018-07-04 8:07 ` [PATCH 1/4] nvmem: rave-sp-eeprom: Remove VLA usage Lucas Stach
2018-07-05 6:15 ` Sascha Hauer [this message]
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=20180705061542.tq7dgyk2cigqwgfw@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.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