Message ID | 20231116140144.work.027-kees@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp3229813vqg; Thu, 16 Nov 2023 06:03:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IEE9uZE4WOE7nUw3qjTmGcokRtZryZ+1V2zQYYa2NhRTOQWyBGMkXmEfUE29Wa+oVuHZPxE X-Received: by 2002:a05:6a20:8e10:b0:185:9b33:b221 with SMTP id y16-20020a056a208e1000b001859b33b221mr15091369pzj.44.1700143419378; Thu, 16 Nov 2023 06:03:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700143419; cv=none; d=google.com; s=arc-20160816; b=GuWt7J4Ge0OC5/9Bc5djSaa1mc4oaFMPyGpTMiinph6mtVjI2hBXCCcxH/jOH4oJeZ 6/DmpIwv2AGzGed2U+wv41L5x1nLzeBTlhsjVU6xudwDdSlbgd6CM273CCPubP0ma0Kp pXhAdAqQCjutOYez2nos+ioCz4xrxfNWHox2+gxDDPmZx4I0rm+bsWDSFpqzZyt7D1Zt cDKDUh+0u3JIWgVHLu5hzBbjpkjcu6ZYLmJmOFgAXGbhcyAdaXgoZrfiyqw/i5oXnFM6 VG+iFWgVxQQDdOax3L8cSNFhJG9Mk6WlnU5wbLwJQdepzoT/3Aj14aX2cHdb0hNgLlmL UA/g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=OqmubgxtpJpRy+t3jjLZe9v6jbuEY+k/dDeNt+y7ewk=; fh=o+FQw0Ssj6mHNmR8cYk2+YkL/QT+O9Iz8MhGsJcHS2Q=; b=H4gYg8qBQWIVwXvEwxZSXxCzDPx1lG4jHWQLkgvHx/EsMKNO2tc3KuU9pul0/THs5/ r4TJCe6NVeCiGACf0Epc43i0D3JgVGddugz3M+RtqNrZ0h2Qk/VIcUBZB8ZUeJ3Zyu/G TBUkWwkmB3TPvTMaNGuoDBzFRvNrIjAJF6fVTHw+vmgiY9dxsUXqb2owbW9d/KHdqixk sb/+cirhy1T7jE+Ne5oTKi3GXUPioROyvaLhyBwpIl3i7W03v+0uIyIOi0PEU/StqLSe EixWmQzJStlCV/XkO+lB0JLtblaQMEkxU714Vn8SWOkheZO0EQjSgppHYXI1xAlqz/TQ UBgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kIhOabIE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id m21-20020a656a15000000b005b92b7a687bsi12988815pgu.314.2023.11.16.06.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 06:03:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kIhOabIE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 8A3DC80EE6D3; Thu, 16 Nov 2023 06:03:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345434AbjKPOCm (ORCPT <rfc822;jaysivo@gmail.com> + 30 others); Thu, 16 Nov 2023 09:02:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345385AbjKPOC2 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 16 Nov 2023 09:02:28 -0500 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8782E171F for <linux-kernel@vger.kernel.org>; Thu, 16 Nov 2023 06:02:18 -0800 (PST) Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6c39ad730aaso751624b3a.0 for <linux-kernel@vger.kernel.org>; Thu, 16 Nov 2023 06:02:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700143337; x=1700748137; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OqmubgxtpJpRy+t3jjLZe9v6jbuEY+k/dDeNt+y7ewk=; b=kIhOabIE72zhSMLtrFyXZnxq4bz1pLfhMPeq+akeoBej1YSe6Pub4Th5rFizsOzMH0 jF07QdN3D8VeI6d/oAfyL3I63+blIQuEBEVwmfnkoJle/4COlLG2Q7bMJsRG4Neh8mqf AfKMcuxZwnYw66huXpMj/N3E0BdiTDAXM/UuI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700143337; x=1700748137; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OqmubgxtpJpRy+t3jjLZe9v6jbuEY+k/dDeNt+y7ewk=; b=whESZ9RMjPBz+cwv3dIgZqxBaMef2Cqy7VWZTBqlWKHASDRIHM0JcFwM7yxBZjZwz4 gaI+YX0igqTeMGDUrdImzXSvTYlDYYil8HjC0nlmx71CKIN9iaCxyyCRw3g8dQUvoNqM 1OF9TVNM7PiPYkaMwjUVT1rNWhgWxjKf8J50Hs1ysiV1M8xN0wDlxOH/oVwBF+DIK9FB pUclqRpd/V0sSd7hdXkH/Ti7BwqRnObrO58Gel2i4IB0tOs+htfyLc6wOYnGkqO7ot6B LaK+ly0L4NcxU/QkkriwcvqSkoUaTu1AMjRNFEszSecECK8JD1NDq5jQczHkNNOevvOz zlgw== X-Gm-Message-State: AOJu0YyTc18ag7iTptKMslWVYQ9E2OOTeKUygffuP8Ut3gYRgO7XYGPg Nht+q7nW4xWDOgClu0RFZJx8iw== X-Received: by 2002:a05:6a20:7292:b0:17d:f127:d435 with SMTP id o18-20020a056a20729200b0017df127d435mr13937235pzk.45.1700143312099; Thu, 16 Nov 2023 06:01:52 -0800 (PST) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id s14-20020a65690e000000b0057c44503835sm2548935pgq.65.2023.11.16.06.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 06:01:51 -0800 (PST) From: Kees Cook <keescook@chromium.org> To: Guenter Roeck <linux@roeck-us.net> Cc: Kees Cook <keescook@chromium.org>, Rob Herring <robh@kernel.org>, Jean Delvare <jdelvare@suse.com>, linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] hwmon: Explicitly initialize nct6775_sio_names indexes Date: Thu, 16 Nov 2023 06:01:47 -0800 Message-Id: <20231116140144.work.027-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2480; i=keescook@chromium.org; h=from:subject:message-id; bh=1CBLvb2An+Ij1IqxYo9cQLowHTbR2aYsJsLLfg4xKq8=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlViDLcz9aCbUgsJCVyqbFezrdEGpNsti+B37jv M346jHjQDuJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZVYgywAKCRCJcvTf3G3A Jk2DEACUk8rhIfFZwVeiVzXN6C47wYLRjwroswyjiBUQUFOSI2KDXV6a+evv1UEZflmzu6kGZX7 BfnurrsZklRVxiABl9d22CAQGg6So8+pohy/C2+9a75/jYo61NKNY5Z9RYj66Ky2A0Va5Ticr9o Dp8EyJvS0Gpmvk79+1yAhhOeCL/PRxA+rwwPbU+DMX4VjXHahrhm1t4puf2feCR9KNOVCcRo2+h /gGWV6rMzysaAUihtxG2mUDojfHE2L+7uISHj90ZJK9U9LHHXFQq9R8aGCKbZlo4mmlEl/ip9wQ AsbcXrs0Jd94j+kVkBUrtwT3CjRVn9kwxWBVzeX3SAAu77bqT/G0AN1FvE3WMcAW/0WRdKvDs7u eCXPjRIWpnXxVYirBaCDMPg32CGddBAHOlBTh7C2kcSXt8PHiBdumvBVB6rtTikFVwTUxTK/AL0 sw1y4mW3SJ4cUrPzwvY+h4O8Q0TtkA0VNo4pyCqumeh2A0Bz4Xiq5hTecX/wP7YkR+hs+2WNqnL 2ieVu9s2tadcO73MWPGDH07liU63FlUAB7LLcz0jBvKOaGlfVxUNpzqxVMV76a8uJpKCCezpgYT LRvvDv/JLtVSLwYlN4lGkhs8Rq1BV5DYREPhKLNvwqURK8oitAtHMHceGljgGiMT0Gh43MZfNLx LDGKpPP q3yl9hlQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 16 Nov 2023 06:03:19 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782729585620008205 X-GMAIL-MSGID: 1782729585620008205 |
Series |
hwmon: Explicitly initialize nct6775_sio_names indexes
|
|
Commit Message
Kees Cook
Nov. 16, 2023, 2:01 p.m. UTC
Changing the "kinds" enum start value to be 1-indexed instead of
0-indexed caused look-ups in nct6775_sio_namesp[] to be misaligned or
off the end. Coverity reported:
*** CID 1571052: Memory - illegal accesses (OVERRUN)
drivers/hwmon/nct6775-platform.c:1075 in nct6775_find()
1069 sio_data->kind == nct6793 || sio_data->kind == nct6795 ||
1070 sio_data->kind == nct6796 || sio_data->kind == nct6797 ||
1071 sio_data->kind == nct6798 || sio_data->kind == nct6799)
1072 nct6791_enable_io_mapping(sio_data);
1073
1074 sio_data->sio_exit(sio_data);
vvv CID 1571052: Memory - illegal accesses (OVERRUN)
vvv Overrunning array "nct6775_sio_names" of 13 8-byte elements at element index 13 (byte offset 111) using index "sio_data->kind" (which evaluates to 13).
1075 pr_info("Found %s or compatible chip at %#x:%#x\n",
1076 nct6775_sio_names[sio_data->kind], sioaddr, addr);
1077
1078 return addr;
1079 }
1080
Initialize the string list with explicit indexes.
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Rob Herring <robh@kernel.org>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: linux-hwmon@vger.kernel.org
Fixes: 0a7093e69c1e ("hwmon: nct6775-i2c: Use i2c_get_match_data()")
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/hwmon/nct6775-platform.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c index 0adeeab7ee03..9aa4dcf4a6f3 100644 --- a/drivers/hwmon/nct6775-platform.c +++ b/drivers/hwmon/nct6775-platform.c @@ -23,19 +23,19 @@ enum sensor_access { access_direct, access_asuswmi }; static const char * const nct6775_sio_names[] __initconst = { - "NCT6106D", - "NCT6116D", - "NCT6775F", - "NCT6776D/F", - "NCT6779D", - "NCT6791D", - "NCT6792D", - "NCT6793D", - "NCT6795D", - "NCT6796D", - "NCT6797D", - "NCT6798D", - "NCT6796D-S/NCT6799D-R", + [nct6106] = "NCT6106D", + [nct6116] = "NCT6116D", + [nct6775] = "NCT6775F", + [nct6776] = "NCT6776D/F", + [nct6779] = "NCT6779D", + [nct6791] = "NCT6791D", + [nct6792] = "NCT6792D", + [nct6793] = "NCT6793D", + [nct6795] = "NCT6795D", + [nct6796] = "NCT6796D", + [nct6797] = "NCT6797D", + [nct6798] = "NCT6798D", + [nct6799] = "NCT6796D-S/NCT6799D-R", }; static unsigned short force_id;