diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-17 20:40:09 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-17 20:40:09 +0300 |
| commit | 84f5685230c6aeb427947a2299dcb54c77863df0 (patch) | |
| tree | 420c23fd53580e5371c5d0a5217cbe261505d0ad | |
| parent | f19f5c49bbc3ffcc9126cc245fc1b24cc29f4a37 (diff) | |
| parent | d8dfa59f5a512a536b80a4a8f12fa993683f48df (diff) | |
| download | linux-84f5685230c6aeb427947a2299dcb54c77863df0.tar.xz | |
Merge tag 'vla-leftovers-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull VLA removal leftovers from Kees Cook:
- bus/imx-weim: Use maximum register count to avoid VLA
- drm/i2c/tda9950: Use maximum CEC message size to avoid VLA
* tag 'vla-leftovers-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
bus: imx-weim: Remove VLA usage
drm/i2c: tda9950: Remove VLA usage
| -rw-r--r-- | drivers/bus/imx-weim.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/i2c/tda9950.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 3d56ebcda720..6a94aa6a22c2 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -45,6 +45,8 @@ static const struct imx_weim_devtype imx51_weim_devtype = { .cs_stride = 0x18, }; +#define MAX_CS_REGS_COUNT 6 + static const struct of_device_id weim_id_table[] = { /* i.MX1/21 */ { .compatible = "fsl,imx1-weim", .data = &imx1_weim_devtype, }, @@ -112,9 +114,12 @@ err: static int __init weim_timing_setup(struct device_node *np, void __iomem *base, const struct imx_weim_devtype *devtype) { - u32 cs_idx, value[devtype->cs_regs_count]; + u32 cs_idx, value[MAX_CS_REGS_COUNT]; int i, ret; + if (WARN_ON(devtype->cs_regs_count > MAX_CS_REGS_COUNT)) + return -EINVAL; + /* get the CS index from this child node's "reg" property. */ ret = of_property_read_u32(np, "reg", &cs_idx); if (ret) diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c index 3f7396caad48..5d2f0d548469 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) - 1)) + return -EINVAL; + buf[0] = addr; memcpy(buf + 1, p, cnt); |