From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2551E263F4D; Tue, 8 Apr 2025 12:32:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115547; cv=none; b=H42VSE3vaXKMrwF0KBVm6DO/6Mj90Gmp0rS12f8TqobVAeyeHcIGPvgG5diQ/2eJflzqMzP0DY4z8tgv4enELeBXYfTDugISeJy0hDIoiZNY+VOfsgtLTmff39FGB3wKX2mHrAMzDEOmSHqB1uvUqPcFz2oPz4EB13ynbhTx+mM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744115547; c=relaxed/simple; bh=eGac2m3GPWMn5DCcpmy1E1GPq4Mvm6kM4ZhrEjaJwiU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qhORrxjcjDjgzk9I0xvWb6vOMEqVEka53ffdEPjlf8Sk8UwnG7DnczJRG4Wx3QbmXFUAtRoOgRYAWg1rSCJoPjLzajwGEDqfeB7hz+0dwjOUv9Ds3wPq3mKRFucFOrIIKkg8p1w/yTrvMLinld+5sBpCrkXI5ukLAGKpOga1BhY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zrPbgGm/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zrPbgGm/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA9A4C4CEE5; Tue, 8 Apr 2025 12:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744115547; bh=eGac2m3GPWMn5DCcpmy1E1GPq4Mvm6kM4ZhrEjaJwiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zrPbgGm/uRiwtNmT19ngy5WEhDp048U8x2mQCcROQESgVfebg8G3zcio+FQI/JRhn fUKkQBFfyMGwO7BhIW29puuJPUsfhvn/nGacccbQV84m+CbqGuYEWwmQ5ZjdYKOmNh NkFWfjUuSiQMYJp1EApCmErnLd1rebNJVAra8Y0k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chenyuan Yang , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.1 016/204] thermal: int340x: Add NULL check for adev Date: Tue, 8 Apr 2025 12:49:06 +0200 Message-ID: <20250408104820.793459456@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.266892317@linuxfoundation.org> References: <20250408104820.266892317@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chenyuan Yang [ Upstream commit 2542a3f70e563a9e70e7ded314286535a3321bdb ] Not all devices have an ACPI companion fwnode, so adev might be NULL. This is similar to the commit cd2fd6eab480 ("platform/x86: int3472: Check for adev == NULL"). Add a check for adev not being set and return -ENODEV in that case to avoid a possible NULL pointer deref in int3402_thermal_probe(). Note, under the same directory, int3400_thermal_probe() has such a check. Fixes: 77e337c6e23e ("Thermal: introduce INT3402 thermal driver") Signed-off-by: Chenyuan Yang Acked-by: Uwe Kleine-König Link: https://patch.msgid.link/20250313043611.1212116-1-chenyuan0y@gmail.com [ rjw: Subject edit, added Fixes: ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/thermal/intel/int340x_thermal/int3402_thermal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c index 43fa351e2b9ec..b7fdf25bfd237 100644 --- a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c @@ -45,6 +45,9 @@ static int int3402_thermal_probe(struct platform_device *pdev) struct int3402_thermal_data *d; int ret; + if (!adev) + return -ENODEV; + if (!acpi_has_method(adev->handle, "_TMP")) return -ENODEV; -- 2.39.5