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
This commit is contained in:
@@ -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)
|
||||
|
Verwijs in nieuw issue
Block a user