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 X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EBFBC433E3 for ; Mon, 27 Jul 2020 14:16:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F10622BF5 for ; Mon, 27 Jul 2020 14:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859411; bh=cPR2zPn5HSoqWO5iLEJ+606lEqfGx63K60WONIiPpHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RNi4N14SH1eZV1M1hB+Rp/rwzQbIWO3JE9kZKCPxONBDuFGDvG9nMW/hU1ncW3rsD Hf8WYd+XewErNJHbvJixRaC/LoHseyvVS0MU0yrtPOxz8mXNsXNm9YLGWXYbdx6UBw ai9ct2EDkeOrBNFsQyPM5/EaQKDMmAP0Yl8aalN4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730918AbgG0OQu (ORCPT ); Mon, 27 Jul 2020 10:16:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:43876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730939AbgG0OQt (ORCPT ); Mon, 27 Jul 2020 10:16:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E6B6F20775; Mon, 27 Jul 2020 14:16:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859409; bh=cPR2zPn5HSoqWO5iLEJ+606lEqfGx63K60WONIiPpHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KvWNlNPlIkSBNq5GCZ9Oy4UDtTxcVR7osSQxe5VRAObHtAHtFCWevU33akQHYPtqD LjhlTbxZ+nN2xDj3/BC8bENscVVJ8S/jjsIgO6qF1sUQaYbFxFqyo1UDPO/ZctRY3V Ml6bFP4R34C0N193n4luvI/13SQ95+vRhgvMoNDY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cristian Marussi , Sudeep Holla , Guenter Roeck , Sasha Levin Subject: [PATCH 5.4 096/138] hwmon: (scmi) Fix potential buffer overflow in scmi_hwmon_probe() Date: Mon, 27 Jul 2020 16:04:51 +0200 Message-Id: <20200727134930.177243965@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134925.228313570@linuxfoundation.org> References: <20200727134925.228313570@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Cristian Marussi [ Upstream commit 3ce17cd2b94907f6d91b81b32848044b84c97606 ] SMATCH detected a potential buffer overflow in the manipulation of hwmon_attributes array inside the scmi_hwmon_probe function: drivers/hwmon/scmi-hwmon.c:226 scmi_hwmon_probe() error: buffer overflow 'hwmon_attributes' 6 <= 9 Fix it by statically declaring the size of the array as the maximum possible as defined by hwmon_max define. Signed-off-by: Cristian Marussi Reviewed-by: Sudeep Holla Link: https://lore.kernel.org/r/20200715121338.GA18761@e119603-lin.cambridge.arm.com Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/scmi-hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwmon/scmi-hwmon.c b/drivers/hwmon/scmi-hwmon.c index 8a7732c0bef3e..7cd13a217c615 100644 --- a/drivers/hwmon/scmi-hwmon.c +++ b/drivers/hwmon/scmi-hwmon.c @@ -147,7 +147,7 @@ static enum hwmon_sensor_types scmi_types[] = { [ENERGY] = hwmon_energy, }; -static u32 hwmon_attributes[] = { +static u32 hwmon_attributes[hwmon_max] = { [hwmon_chip] = HWMON_C_REGISTER_TZ, [hwmon_temp] = HWMON_T_INPUT | HWMON_T_LABEL, [hwmon_in] = HWMON_I_INPUT | HWMON_I_LABEL, -- 2.25.1