lkml.org 
[lkml]   [2022]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue
On Tue, Sep 20, 2022 at 8:19 AM <chao.qin@intel.com> wrote:
>
> From: Chao Qin <chao.qin@intel.com>
>
> When value < time_unit, the parameter of ilog2() will be zero and
> the return value is -1. u64(-1) is too large for shift exponent
> and then will trigger shift-out-of-bounds:
>
> shift exponent 18446744073709551615 is too large for 32-bit type 'int'
> Call Trace:
> rapl_compute_time_window_core
> rapl_write_data_raw
> set_time_window
> store_constraint_time_window_us
>
> Signed-off-by: Chao Qin <chao.qin@intel.com>
> Acked-by: Zhang Rui <rui.zhang@intel.com>
> ---
> drivers/powercap/intel_rapl_common.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index 21d624f9f5fb..bf91248630c3 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -994,6 +994,9 @@ static u64 rapl_compute_time_window_core(struct rapl_package *rp, u64 value,
> y = value & 0x1f;
> value = (1 << y) * (4 + f) * rp->time_unit / 4;
> } else {
> + if (value < rp->time_unit)
> + return 0;
> +
> do_div(value, rp->time_unit);
> y = ilog2(value);
> f = div64_u64(4 * (value - (1 << y)), 1 << y);
> --

Applied as 6.1 material, thanks!

\
 
 \ /
  Last update: 2022-09-21 20:18    [W:0.055 / U:1.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site