From patchwork Mon Oct 24 11:31:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8789 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp430754wru; Mon, 24 Oct 2022 05:42:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Ltl/wu40hUB6KM5a4GXOInFIy8sJq0HocakVJn6am0ujYBELnI1mWHZs/pmGdQpxu9Rna X-Received: by 2002:a05:6a00:14d4:b0:563:9296:f320 with SMTP id w20-20020a056a0014d400b005639296f320mr32655002pfu.27.1666615332720; Mon, 24 Oct 2022 05:42:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615332; cv=none; d=google.com; s=arc-20160816; b=BXC6CaBnX8kBQPvfxXbginomoIi/8hQLzpcZKOil+cu8S+VyxsDNxnokb2zJaaC/gH wzZpNGT/3oxNAVJmAcNongxF2WWNV53aCw8uPcf1x07734cdHRLhn8Ni8QUoWx0A7ax+ be9kL9U2Hru3U6zuMZhQPgpGT1G0/ve54XknCvlDtb5DIA3Qo4Dhi1n2JXMUg4UbQFlF yNMMbPxkeiiOb57QJEEDrCU6tyr7IPgJlQgNIsWCvi/fLkeGfumsBMhioQKQNdTnYb0B ah7O0OPXZVvyoeryM7K6aca1BaaEL1WAlzv/Vo15uBCDaJSTUXFQgAK5OvmbEXSVW88x Q+Ew== 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=u1nUDZwJH88xqbSZOPerD8B6svewWmzIZCocoVzjnr8=; b=OC6DKVCqLgc/340EbTZ4tWJjxHgvknqicUpLI9rKXaKVoUlz4TYcH8VNcj9aABiKWH /E5DfvzAx+TpkNHvfUfmjoxN+1s4Fi0GE6QZVA5j8hpKxVK0S3v0Zrt1n8Ks2rwKiAH7 5LZtOzkJbEv9K6aq2jhr7eSa323LpdeeCZ77FRcB6cXFbDPm6mmspvYizxejAMMJMKen DR4v0LXCse70t394W/F9JU+Dn11n4OmNjZ5krcNQyfFNiAwCC4mHMQ4qtMpbNayp2MNv V93VgdaXikGJ1P3HZflnztV46QDYgo+6hXE4zn27ESELkdgBfzmQtUFmK6XqTJdOx0vG JUoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KWQw1KSB; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r10-20020a632b0a000000b0046e96b9ed89si15488822pgr.867.2022.10.24.05.41.58; Mon, 24 Oct 2022 05:42:12 -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=KWQw1KSB; 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 S233795AbiJXMdY (ORCPT + 99 others); Mon, 24 Oct 2022 08:33:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234091AbiJXM3S (ORCPT ); Mon, 24 Oct 2022 08:29:18 -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 6F7C0876B1; Mon, 24 Oct 2022 05:03:15 -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 AB95561295; Mon, 24 Oct 2022 11:52:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1482C433C1; Mon, 24 Oct 2022 11:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612350; bh=Xdon2nvoGD4MV8vws9pMZ7TJIM8qOOsBVdwLNw/twmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KWQw1KSBqFRU+stAACUmfFabr5W/N4zcx4gxlScIMcM6rAa8gIoKmFln31FjpjOsQ tOoGIzgB3mbnE5ORomKOUQi9BFZbfCjY8XMtbSpDed2G5jIHthA03aKV0xhPGcEOXp gzrLZqg913HWjJxyNKQ67BtyoofDvHuyBlwpY+3A= 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 4.14 163/210] powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue Date: Mon, 24 Oct 2022 13:31:20 +0200 Message-Id: <20221024113002.259840081@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747572838916579060?= X-GMAIL-MSGID: =?utf-8?q?1747572838916579060?= 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.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index 54ddd78924dd..5c07e04db421 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -1066,6 +1066,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);