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: 13192187 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C43EEC74A5B for ; Wed, 29 Mar 2023 09:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230045AbjC2JCY (ORCPT ); Wed, 29 Mar 2023 05:02:24 -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 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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; }