]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
misc: vexpress: Off by one in vexpress_syscfg_exec()
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 3 Dec 2018 14:52:19 +0000 (17:52 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Feb 2019 09:09:07 +0000 (10:09 +0100)
commit f8a70d8b889f180e6860cb1f85fed43d37844c5a upstream.

The > comparison should be >= to prevent reading beyond the end of the
func->template[] array.

(The func->template array is allocated in vexpress_syscfg_regmap_init()
and it has func->num_templates elements.)

Fixes: 974cc7b93441 ("mfd: vexpress: Define the device as MFD cells")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/vexpress-syscfg.c

index b3a812384a6f90a46384b0aac2050707e513b049..2c12c99cacde74684b9f7954a2f03156e16d342d 100644 (file)
@@ -61,7 +61,7 @@ static int vexpress_syscfg_exec(struct vexpress_syscfg_func *func,
        int tries;
        long timeout;
 
-       if (WARN_ON(index > func->num_templates))
+       if (WARN_ON(index >= func->num_templates))
                return -EINVAL;
 
        command = readl(syscfg->base + SYS_CFGCTRL);