From patchwork Wed Mar 29 09:00:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 76486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp277187vqo; Wed, 29 Mar 2023 02:20:20 -0700 (PDT) X-Google-Smtp-Source: AKy350anZNyXe2WIUAL7cz2evoJYH2wQ8JBmbsdkIwN7gsJCEchctgWOAFib0hhAU5qCVADwPJBX X-Received: by 2002:a17:902:ced0:b0:19e:7a2c:78a7 with SMTP id d16-20020a170902ced000b0019e7a2c78a7mr20585511plg.57.1680081620599; Wed, 29 Mar 2023 02:20:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680081620; cv=none; d=google.com; s=arc-20160816; b=RWYjyE1zjReQ95lo0kM0s9GPyfj5qtU/gNI+kl8YeE85u+ZM0yGh+CoPjENKF5UlvZ B5KlUwn3yZDh21CZTJS1wuKQyWq91XlM0d5DHZVRo36sNdd6IoSncyN6537sNKyRaaiC CwKJxcTJ1gohevzM7OzwBJeblezS/fGkOvqeBp66ggFNXt0Ml0WnXXd8bCZR5rfiESFV AB6mbcu5cmkDlzvC0xExhfKEpiwAH5wxM4zguTiH5qQlLwMECjQa0AmO0lQEUDdtanKW PqMXhWFoBcrYSlc67XsoYIcpKgY1d49C4tcMSbhM2DjOOCZcuT3uk0NlTerfbapRUGEI NILw== 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=/em/cTbH5xFNgT5F0G1wwB8OubHKzw0ZFET6cLvYbI4=; b=b1utmNvGraOeR3KlX85pNemUUwsnvLgcuqfsnW8Dx2BMxfMK0jIA6zu2CJ41zJs5Vi Pfb1s5ffz2h1GdgEV8h0ag7yvBqGeebbENAe39QO5yLmwwn5DfARPyV73FZbjzr9VT2n CN7DTTCYQhEbNMlKiwEnee+Hr9Imo0F1aOUVejpMJVNJDzwwX0ZIdKSyVM6zeAc20e6B Jk1PhCOmrlZTOCirwhKgujv/noIFYUXPlZCaOtU7PUTnpDLuXvKrl08QPzWccaIXbaHE wmZKD7je9vv6/gby+W2QNLvwqj/8ikhSiaujQ1W7/FMgEXMstpHGfKUe2P2VxW2a2wCo eQUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VJvlDSum; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u8-20020a170903124800b0019f7977c9cfsi8654051plh.319.2023.03.29.02.20.07; Wed, 29 Mar 2023 02:20:20 -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=@intel.com header.s=Intel header.b=VJvlDSum; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbjC2JC0 (ORCPT + 99 others); Wed, 29 Mar 2023 05:02:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbjC2JCV (ORCPT ); Wed, 29 Mar 2023 05:02:21 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46DD549C7; Wed, 29 Mar 2023 02:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680080509; x=1711616509; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=MpN+NoE8ltrbIOFRhoiH8RX1fmB1SfinxkoJtqy1yZQ=; b=VJvlDSumZvChIuQE72fkllLEKkkOVJkHZLdhTmR128bZ978zpCRHRUyR Msklf7Co3nNoy1WWs+vUuceDB9ocfnyPvIXwopKtPtnCKZ9gvSs5yKTiN E3awsYZ5bx5dRAImEgwl8t7ydZxjq8tJDOGAFFZzp4drQUpBotH7bSstQ u4g+oYUsXKrF3lEyAHHdwuQoqkRlcoJVKK+4bkXUbzDbzBnFljn7o2xyD Pw5ZIrZtfLfnBTIQagYLuQEN7KvSDQ6v9uC/tEOX7DC3fRV/mUdXoIMLf YeytPmGqGHRCbOZXZ0KeAJmhk0yniAf7ddqIY8qnOqG94BfM04uLcaVts Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="324726927" X-IronPort-AV: E=Sophos;i="5.98,300,1673942400"; d="scan'208";a="324726927" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2023 02:01:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="748717768" X-IronPort-AV: E=Sophos;i="5.98,300,1673942400"; d="scan'208";a="748717768" Received: from wenqin8x-mobl1.ccr.corp.intel.com (HELO rzhang1-DESK.intel.com) ([10.254.212.141]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2023 02:01:03 -0700 From: Zhang Rui To: linux-pm@vger.kernel.org, rafael.j.wysocki@intel.com, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH -next] thermal/drivers/thermal_hwmon: Fix a kernel NULL pointer dereference Date: Wed, 29 Mar 2023 17:00:55 +0800 Message-Id: <20230329090055.7537-1-rui.zhang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761693265315078001?= X-GMAIL-MSGID: =?utf-8?q?1761693265315078001?= When the hwmon device node of a thermal zone device is not found, using hwmon->device causes a kernel NULL pointer dereference. Reported-by: Preble Adam C Signed-off-by: Zhang Rui Acked-by: Daniel Lezcano Signed-off-by: Rafael J. Wysocki Acked-by: Daniel Lezcano --- Fixes: dec07d399cc8 ("thermal: Don't use 'device' internal thermal zone structure field") dec07d399cc8 is a commit in the linux-next branch of linux-pm repo. I'm not sure if the Fix tag applies to such commit or not. --- drivers/thermal/thermal_hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c index c59db17dddd6..261743f461be 100644 --- a/drivers/thermal/thermal_hwmon.c +++ b/drivers/thermal/thermal_hwmon.c @@ -229,7 +229,7 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz) hwmon = thermal_hwmon_lookup_by_type(tz); if (unlikely(!hwmon)) { /* Should never happen... */ - dev_dbg(hwmon->device, "hwmon device lookup failed!\n"); + dev_dbg(&tz->device, "hwmon device lookup failed!\n"); return; }