All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jelle van der Waa <jvanderwaa@redhat.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: Jelle van der Waa <jvanderwaa@redhat.com>,
	platform-driver-x86@vger.kernel.org,
	Mark Pearson <markpearson@lenovo.com>
Subject: [PATCH] platform/x86: thinkpad_acpi: skip invalid fan speed
Date: Wed, 19 Oct 2022 21:47:51 +0200	[thread overview]
Message-ID: <20221019194751.5392-1-jvanderwaa@redhat.com> (raw)
In-Reply-To: <20221014211709.6322-2-jvanderwaa@redhat.com>

65535 is most likely an invalid read.

Signed-off-by: Jelle van der Waa <jvanderwaa@redhat.com>

---

Cc: Mark Pearson <markpearson@lenovo.com>
---
 drivers/platform/x86/thinkpad_acpi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 6a823b850a77..20e5c043a8e8 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -263,6 +263,8 @@ enum tpacpi_hkey_event_t {
 #define TPACPI_DBG_BRGHT	0x0020
 #define TPACPI_DBG_MIXER	0x0040
 
+#define FAN_NOT_PRESENT		65535
+
 #define strlencmp(a, b) (strncmp((a), (b), strlen(b)))
 
 
@@ -8876,7 +8878,7 @@ static int __init fan_init(struct ibm_init_struct *iibm)
 			/* Try and probe the 2nd fan */
 			tp_features.second_fan = 1; /* needed for get_speed to work */
 			res = fan2_get_speed(&speed);
-			if (res >= 0) {
+			if (res >= 0 && speed != FAN_NOT_PRESENT) {
 				/* It responded - so let's assume it's there */
 				tp_features.second_fan = 1;
 				tp_features.second_fan_ctl = 1;
-- 
2.38.1


  parent reply	other threads:[~2022-10-19 19:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20221014211709.6322-1-jvanderwaa@redhat.com>
     [not found] ` <20221014211709.6322-2-jvanderwaa@redhat.com>
2022-10-15 14:22   ` [PATCH 1/1] platform/x86: thinkpad_acpi: skip invalid fan speed Hans de Goede
2022-10-17 20:05     ` [External] " Mark Pearson
2022-10-19 19:47   ` Jelle van der Waa [this message]
2022-10-24  9:25     ` [PATCH] " Hans de Goede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221019194751.5392-1-jvanderwaa@redhat.com \
    --to=jvanderwaa@redhat.com \
    --cc=hdegoede@redhat.com \
    --cc=markpearson@lenovo.com \
    --cc=platform-driver-x86@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.