From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795022528; b=omLYijjKZXDee4ZoXwzBJrt5IovDgLHJUAmCR7GAfKdMk0avafGgokgkq1X+/sJgBC/q hEpGbccmvdQmBOxLQFKuWlQRQ1qBrOYPtqfczFCIQEAGHlaUijjhBEl9HFvdxriP8drJ6 cfIROro4kJQQ0a3UnLRLeIrQa8/4mSt+pOqARRVryJsZkniSgcYd2vswJ3TzEB0BmMi24 rJan7dKLYPpTifOOsYQMZznOKyp61wzEDWk9QWzDWToVF1rfoiybpvLCjQkb5ODWMg9qO X8JMWTcVbcGeMF4zJ8t28P+XeZixIYTIcfSz4Ahn55P+OYWF0FmgqmxLAE0jGIxe3SA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795022528; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=xpKfiDlyJHlLeSLiymDjnCIidmK72PmWYTFNJjSh57U=; b=kqLnwQ7lkzKQJiJjGXMO2XrisXCgphstpBZdPqU4R4KHpyeP2zmXGM/NnKdvgX9pUgQd rj3kL8rWVnLpqULRWNPLZ3J7IOgXgt7get9EQzix19jVS8O7YaBanWKCPa3v+b5MBoB3M IDqYUUhFRFQKrZXvA8uLX02kMq7RlHa1vB+vSPiSQA0rCjQ3CW4j5Djhl2S9T6ncgwQC7 IXq6lfQ/tH/OKmzPpV7dyO5Rz6TNsr0kY1ew/gZfByeREkOty+CaLcpGHveDgFIJhTCAN x/4dTlg3j2gdMDvx59v2ftiVmzpPVNqHWYqSV/hYKfhWVo6yHYgaU3BUz6bI52N3LMw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=pZ3ly62a; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8312B606A32A; Wed, 18 Nov 2026 17:22:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=pZ3ly62a Received: by smtp.kernel.org (Postfix) with ESMTPSA id A68981F000C4; Wed, 18 Nov 2026 17:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795022528; bh=xpKfiDlyJHlLeSLiymDjnCIidmK72PmWYTFNJjSh57U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pZ3ly62abtcXXNm2RLSc+4EoqrllqVXMKexSXFgz7EIdnDs1bXITKO4LkaxmBOyCt HlVfydhXANJwLVPQEJPqiAus5m9Y+f31sa/jrw5YdFRpwAQjvUtwgdPkrQX1AtuYos txM5Xmb4qiskJjdxh1jXATpLJu56YLQMb/xOnPSI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Javier Carrasco , Guenter Roeck , Sasha Levin Subject: [PATCH 6.18 0043/2151] hwmon: chipcap2: serialize access to the alarm indicators Date: Wed, 18 Nov 2026 15:29:38 +0100 Message-ID: <20261118150123.274507656@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Javier Carrasco [ Upstream commit bed5f0c075eb99442fca6a61c009a32752eceda2 ] low_alarm and high_alarm are accessed from the threaded interrupt handlers and from sysfs without any locking, which can lead to lost alarms. Add a mutex to serialize the access to the alarm indicators and to process_irqs, which the handlers use to decide whether an interrupt belongs to an ongoing operation. Fixes: 3af350929e75 ("hwmon: Add support for Amphenol ChipCap 2") Cc: stable@vger.kernel.org Signed-off-by: Javier Carrasco Link: https://patch.msgid.link/20261014-chipcap2_locks-v3-10-27ebfc2c5b9e@gmail.com [groeck: Dropped obsolete 'Assisted-by: tag] Signed-off-by: Guenter Roeck Stable-dep-of: 8c02722be2ca ("hwmon: chipcap2: synchronize ready IRQ state") Signed-off-by: Sasha Levin --- drivers/hwmon/chipcap2.c | 58 +++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/drivers/hwmon/chipcap2.c b/drivers/hwmon/chipcap2.c index 6d564199729ce..8dca9d1e9945d 100644 --- a/drivers/hwmon/chipcap2.c +++ b/drivers/hwmon/chipcap2.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -88,6 +89,8 @@ struct cc2_data { int irq_low; int irq_high; bool process_irqs; + /* protects process_irqs and the alarm indicators */ + struct mutex irq_lock; bool regulator_enabled; }; @@ -119,7 +122,8 @@ static int cc2_enable(struct cc2_data *data) /* exclusive regulator, check in case a disable failed */ if (data->regulator_enabled) { - data->process_irqs = true; + scoped_guard(mutex, &data->irq_lock) + data->process_irqs = true; return 0; } @@ -134,7 +138,8 @@ static int cc2_enable(struct cc2_data *data) usleep_range(CC2_STARTUP_TIME_US, CC2_STARTUP_TIME_US + 125); - data->process_irqs = true; + scoped_guard(mutex, &data->irq_lock) + data->process_irqs = true; return 0; } @@ -151,7 +156,8 @@ static void cc2_disable(struct cc2_data *data) synchronize_irq(data->irq_high); /* ignore alarms triggered by voltage toggling when powering up */ - data->process_irqs = false; + scoped_guard(mutex, &data->irq_lock) + data->process_irqs = false; /* exclusive regulator, check in case an enable failed */ if (!data->regulator_enabled) @@ -507,10 +513,12 @@ static irqreturn_t cc2_low_interrupt(int irq, void *data) { struct cc2_data *cc2 = data; - if (cc2->process_irqs) { - hwmon_notify_event(cc2->hwmon, hwmon_humidity, - hwmon_humidity_min_alarm, 0); - cc2->rh_alarm.low_alarm = true; + scoped_guard(mutex, &cc2->irq_lock) { + if (cc2->process_irqs) { + hwmon_notify_event(cc2->hwmon, hwmon_humidity, + hwmon_humidity_min_alarm, 0); + cc2->rh_alarm.low_alarm = true; + } } return IRQ_HANDLED; @@ -520,10 +528,12 @@ static irqreturn_t cc2_high_interrupt(int irq, void *data) { struct cc2_data *cc2 = data; - if (cc2->process_irqs) { - hwmon_notify_event(cc2->hwmon, hwmon_humidity, - hwmon_humidity_max_alarm, 0); - cc2->rh_alarm.high_alarm = true; + scoped_guard(mutex, &cc2->irq_lock) { + if (cc2->process_irqs) { + hwmon_notify_event(cc2->hwmon, hwmon_humidity, + hwmon_humidity_max_alarm, 0); + cc2->rh_alarm.high_alarm = true; + } } return IRQ_HANDLED; @@ -539,11 +549,13 @@ static int cc2_humidity_min_alarm_status(struct cc2_data *data, long *val) if (ret < 0) return ret; - if (data->rh_alarm.low_alarm) { - *val = (measurement < min_hyst) ? 1 : 0; - data->rh_alarm.low_alarm = *val; - } else { - *val = 0; + scoped_guard(mutex, &data->irq_lock) { + if (data->rh_alarm.low_alarm) { + *val = (measurement < min_hyst) ? 1 : 0; + data->rh_alarm.low_alarm = *val; + } else { + *val = 0; + } } return 0; @@ -559,11 +571,13 @@ static int cc2_humidity_max_alarm_status(struct cc2_data *data, long *val) if (ret < 0) return ret; - if (data->rh_alarm.high_alarm) { - *val = (measurement > max_hyst) ? 1 : 0; - data->rh_alarm.high_alarm = *val; - } else { - *val = 0; + scoped_guard(mutex, &data->irq_lock) { + if (data->rh_alarm.high_alarm) { + *val = (measurement > max_hyst) ? 1 : 0; + data->rh_alarm.high_alarm = *val; + } else { + *val = 0; + } } return 0; @@ -707,6 +721,8 @@ static int cc2_probe(struct i2c_client *client) i2c_set_clientdata(client, data); + mutex_init(&data->irq_lock); + data->client = client; data->regulator = devm_regulator_get_exclusive(dev, "vdd"); -- 2.53.0