lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 130/179] hwmon: (scmi) Fix potential buffer overflow in scmi_hwmon_probe()
    Date
    From: Cristian Marussi <cristian.marussi@arm.com>

    [ Upstream commit 3ce17cd2b94907f6d91b81b32848044b84c97606 ]

    SMATCH detected a potential buffer overflow in the manipulation of
    hwmon_attributes array inside the scmi_hwmon_probe function:

    drivers/hwmon/scmi-hwmon.c:226
    scmi_hwmon_probe() error: buffer overflow 'hwmon_attributes' 6 <= 9

    Fix it by statically declaring the size of the array as the maximum
    possible as defined by hwmon_max define.

    Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
    Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
    Link: https://lore.kernel.org/r/20200715121338.GA18761@e119603-lin.cambridge.arm.com
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hwmon/scmi-hwmon.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c
    index 286d3cfda7de8..d421e691318b3 100644
    --- a/drivers/hwmon/scmi-hwmon.c
    +++ b/drivers/hwmon/scmi-hwmon.c
    @@ -147,7 +147,7 @@ static enum hwmon_sensor_types scmi_types[] = {
    [ENERGY] = hwmon_energy,
    };

    -static u32 hwmon_attributes[] = {
    +static u32 hwmon_attributes[hwmon_max] = {
    [hwmon_chip] = HWMON_C_REGISTER_TZ,
    [hwmon_temp] = HWMON_T_INPUT | HWMON_T_LABEL,
    [hwmon_in] = HWMON_I_INPUT | HWMON_I_LABEL,
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-27 16:24    [W:4.063 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site