* [PATCH] drm/i2c: tda9950: Remove VLA usage
@ 2018-06-20 18:27 Kees Cook
2018-07-17 4:02 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2018-06-20 18:27 UTC (permalink / raw)
To: David Airlie; +Cc: linux-kernel, Hans Verkuil, Russell King, dri-devel
In the quest to remove all stack VLA usage from the kernel[1], this
sets the buffer to maximum size and adds a sanity check.
[1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/gpu/drm/i2c/tda9950.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c
index 3f7396caad48..28314433c351 100644
--- a/drivers/gpu/drm/i2c/tda9950.c
+++ b/drivers/gpu/drm/i2c/tda9950.c
@@ -76,9 +76,12 @@ struct tda9950_priv {
static int tda9950_write_range(struct i2c_client *client, u8 addr, u8 *p, int cnt)
{
struct i2c_msg msg;
- u8 buf[cnt + 1];
+ u8 buf[CEC_MAX_MSG_SIZE + 3];
int ret;
+ if (WARN_ON(cnt > sizeof(buf)))
+ return -EINVAL;
+
buf[0] = addr;
memcpy(buf + 1, p, cnt);
--
2.17.1
--
Kees Cook
Pixel Security
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/i2c: tda9950: Remove VLA usage
2018-06-20 18:27 [PATCH] drm/i2c: tda9950: Remove VLA usage Kees Cook
@ 2018-07-17 4:02 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2018-07-17 4:02 UTC (permalink / raw)
To: David Airlie
Cc: LKML, Hans Verkuil, Russell King, Maling list - DRI developers
On Wed, Jun 20, 2018 at 11:27 AM, Kees Cook <keescook@chromium.org> wrote:
> In the quest to remove all stack VLA usage from the kernel[1], this
> sets the buffer to maximum size and adds a sanity check.
>
> [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Friendly ping! Who's tree should this go through?
Thanks!
-Kees
> ---
> drivers/gpu/drm/i2c/tda9950.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c
> index 3f7396caad48..28314433c351 100644
> --- a/drivers/gpu/drm/i2c/tda9950.c
> +++ b/drivers/gpu/drm/i2c/tda9950.c
> @@ -76,9 +76,12 @@ struct tda9950_priv {
> static int tda9950_write_range(struct i2c_client *client, u8 addr, u8 *p, int cnt)
> {
> struct i2c_msg msg;
> - u8 buf[cnt + 1];
> + u8 buf[CEC_MAX_MSG_SIZE + 3];
> int ret;
>
> + if (WARN_ON(cnt > sizeof(buf)))
> + return -EINVAL;
> +
> buf[0] = addr;
> memcpy(buf + 1, p, cnt);
>
> --
> 2.17.1
>
>
> --
> Kees Cook
> Pixel Security
--
Kees Cook
Pixel Security
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-17 4:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-20 18:27 [PATCH] drm/i2c: tda9950: Remove VLA usage Kees Cook
2018-07-17 4:02 ` Kees Cook
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).