lkml.org 
[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 079/144] hwmon: (occ) Fix division by zero issue
    Date
    [ Upstream commit 211186cae14de09573b062e478eb9fe215aed8d9 ]

    The code in occ_get_powr_avg() invokes div64_u64() without checking the
    divisor. In case the divisor is zero, kernel gets an "Division by zero
    in kernel" error.

    Check the divisor and make it return 0 if the divisor is 0.

    Fixes: c10e753d43eb ("hwmon (occ): Add sensor types and versions")
    Signed-off-by: Lei YU <mine260309@gmail.com>
    Reviewed-by: Eddie James <eajames@linux.ibm.com>
    Link: https://lore.kernel.org/r/1562813088-23708-1-git-send-email-mine260309@gmail.com
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hwmon/occ/common.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c
    index 13a6290c8d254..f02aa403332c2 100644
    --- a/drivers/hwmon/occ/common.c
    +++ b/drivers/hwmon/occ/common.c
    @@ -402,8 +402,10 @@ static ssize_t occ_show_power_1(struct device *dev,

    static u64 occ_get_powr_avg(u64 *accum, u32 *samples)
    {
    - return div64_u64(get_unaligned_be64(accum) * 1000000ULL,
    - get_unaligned_be32(samples));
    + u64 divisor = get_unaligned_be32(samples);
    +
    + return (divisor == 0) ? 0 :
    + div64_u64(get_unaligned_be64(accum) * 1000000ULL, divisor);
    }

    static ssize_t occ_show_power_2(struct device *dev,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-14 19:55    [W:2.769 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site