From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F7C3C433F5 for ; Sun, 9 Oct 2022 20:57:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230271AbiJIU5m (ORCPT ); Sun, 9 Oct 2022 16:57:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230402AbiJIUz6 (ORCPT ); Sun, 9 Oct 2022 16:55:58 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FE7831ED4; Sun, 9 Oct 2022 13:53:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D4CE6B80DC4; Sun, 9 Oct 2022 20:53:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFDE1C433C1; Sun, 9 Oct 2022 20:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665348805; bh=LMpvV+Axxobl3nMGH8clYz35R+yJiKcgygsY85XwLhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IkcjzOnL/BejMrH03irqbako0Pd0hjm1B+AN1Ce9HlHW+RwBzODlRlK9BlOyK/Yfm 3avhvPpadkRpK4Y07+5GkdBiHEUD54OXUd92Lh5+Y23dPTOXDYDdJatgbIm7wc9j3a 9fI/XHjodvrQoDMx+ct8IZeRsCUoFTdBdVoovVcWc8I5XmOcBQohmnClJsdhYG5y0b MUdoRFjsOho6J8des8hR8zIZwpiYScyiAM0ff5SfHU/c6pGk6hVja1AVyTt1xWygMR 3Wc9fsAziA5frf2dFQMBr/H05YcyK56XcXLdyhJJ5jmFVGBh0BtxzTqPP5NSVBx9GP oshvwJWjAd1lQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chao Qin , Zhang Rui , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 09/15] powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue Date: Sun, 9 Oct 2022 16:53:02 -0400 Message-Id: <20221009205308.1202627-9-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009205308.1202627-1-sashal@kernel.org> References: <20221009205308.1202627-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Qin [ Upstream commit 2d93540014387d1c73b9ccc4d7895320df66d01b ] 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 Acked-by: Zhang Rui Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- 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 7c0099e7a6d7..0f0a7191d040 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -938,6 +938,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); -- 2.35.1