Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7026393rwi; Mon, 24 Oct 2022 08:57:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM74CA8ygXpEL4bhWV/nznsljCvD/6Ji7f+pPjXueixlHBgbp176Vz9IhCHHYN5e6F2dRdRZ X-Received: by 2002:a05:6402:3581:b0:461:a977:5f86 with SMTP id y1-20020a056402358100b00461a9775f86mr7787624edc.33.1666627072261; Mon, 24 Oct 2022 08:57:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627072; cv=none; d=google.com; s=arc-20160816; b=ZTWjso0xEwuRzZRRxCWx+QPU++XLWFHjqbFeG5PJMQA11lId2UvOKR9vQh9EPzteHC Zv4gPPasEW0qbQyey+a0eFZ+d6RQEuVD1+uPFXJu7Mlc9tZRONiiHKMcb5E8z/fWQaJu ucvWAFg16Q6szE5j+gZxp8UnJXGJ6AlsoPl1/yUwFYkbzYwCuZ+rV4q6HNRtv92CtB4q gEM87+65WZ+khNjp8T3+oM41MrgYH/XSnArO85cHnGb4F2Chnt26alMcz7AVYzrJ5oq6 eJ+1Bih6LQhZNiwqZAaKpicYYZ84t4Wgvb0A7/8Bppp5b8v2Mqpp6kdGPN+6qnL7pNyM SdNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PxAJdwtyCSSTr3yuEONR1GAxiope8r8d95k9T76SF6g=; b=umHGXy4ma7DcorlH/ZaC+cYIdZn2TkFC1sCagsjP/wA8M6on4lusYtu86B3opJhX4j P01qC4jBnJB8GN+nfRpJxURE3eMww/nbm5i6aos/g6LJ4fWEQytjc2tJlUuU2fwI7FwR cC92O0SefscIZhM9F0wU7+4/XDXJqNY9hg9PRTohNachPoqng36oHfHxLkfeGRMsm8f+ S+vpuBuF3Uoa8E5RlO1BLwOEn0v0tcRBwoWR6VPFcodbeAtO1GY2/JH80HYxPjtX4NMk Wgv0alyd11APDCzhpKmiXph1Qzx4vDVywPpmof7rnF6H+T3hk0YFZITyB/xSmHcdLUtw FUTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Qhy3kO+9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q16-20020a056402519000b00461727807a4si105813edd.534.2022.10.24.08.57.27; Mon, 24 Oct 2022 08:57:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Qhy3kO+9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233568AbiJXOLk (ORCPT + 99 others); Mon, 24 Oct 2022 10:11:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233745AbiJXOIK (ORCPT ); Mon, 24 Oct 2022 10:08:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6F79C356D; Mon, 24 Oct 2022 05:50:52 -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 dfw.source.kernel.org (Postfix) with ESMTPS id C388161278; Mon, 24 Oct 2022 12:50:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC0A7C43470; Mon, 24 Oct 2022 12:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615851; bh=X26i60xryaFLNMtK+OWA4cTNd+/tSZbqpxyEohtbfCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qhy3kO+9we0lcQhNd32XE9a/KC0M7HER3Sh7mhuEgyDd4lPVR/2z3TNB9L19ANTza xznUfnQgYpYBADnUUGMoYWbdyvdTyPD18RNZxV+Z6lQfE8B8XvhiLDlhCQ7z+n6/Bn lkbIx49J8HVx4OFPknLFepTMfAjjLJbrJvV43XX0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Qin , Zhang Rui , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.15 408/530] powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue Date: Mon, 24 Oct 2022 13:32:32 +0200 Message-Id: <20221024113103.543084331@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 c87d4687aa67..9dfc053878fd 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