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 2C78B188907; Mon, 2 Jun 2025 15:08:50 +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=1748876930; cv=none; b=laHjfrmhYjw3yrA0lJDlV4g2lkR2BHtCEuo/G5/2h+hTAy+JHpdhpv+8NUfXPTC4S0RDUcf/GWYeUAy1BP/3aNtGeNqA49UAILE5CM9c8KQY5iTe5X86rNKVj3FoTAilax9S8wFaZgTQ9NhZa/8c3oNcTyhWF7DyrOsoWPjxTyg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876930; c=relaxed/simple; bh=1zEzaeN6JnXUnJg0KEJMqT2VemRf6cVccOMg5PuULNo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dnjn0FOhQGVqDF6P+G1hMEm4cC4/SJaV60p3A1YIW5d3B8eDh0ci04wPdv/gZY+ZfWl4qQusOkk+7mtTTURTRweQctD1SZdVBieEsdnJ0GAUbtWcwKkoTgAn+Ud4BhfGzwlbiP4jnIBrINzeZCV7+pSJNJBKmMeUtBkPi88Etw0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FzZ+W+6N; 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="FzZ+W+6N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A3E0C4CEEB; Mon, 2 Jun 2025 15:08:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748876930; bh=1zEzaeN6JnXUnJg0KEJMqT2VemRf6cVccOMg5PuULNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FzZ+W+6NUqk1pE0DgKBcXeuxtdbE8m0nC3ky2IXy21rj9w4LpBtVGMLuxLr2wBgVH QwZ/zeZNJL1kcN0VJrOQCpXVcV0TGujlPJhOa/LfHTS6anXHyYmdUBKAMTMBCoQ+q5 +x12qGRXmT8gSmgMcsTDYwehxgLGw3X82wgSmAMU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexander Stein , Guenter Roeck , Sasha Levin Subject: [PATCH 6.1 119/325] hwmon: (gpio-fan) Add missing mutex locks Date: Mon, 2 Jun 2025 15:46:35 +0200 Message-ID: <20250602134324.618391261@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Stein [ Upstream commit 9fee7d19bab635f89223cc40dfd2c8797fdc4988 ] set_fan_speed() is expected to be called with fan_data->lock being locked. Add locking for proper synchronization. Signed-off-by: Alexander Stein Link: https://lore.kernel.org/r/20250210145934.761280-3-alexander.stein@ew.tq-group.com Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/gpio-fan.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c index ba408942dbe73..f1926b9171e0c 100644 --- a/drivers/hwmon/gpio-fan.c +++ b/drivers/hwmon/gpio-fan.c @@ -392,7 +392,12 @@ static int gpio_fan_set_cur_state(struct thermal_cooling_device *cdev, if (state >= fan_data->num_speed) return -EINVAL; + mutex_lock(&fan_data->lock); + set_fan_speed(fan_data, state); + + mutex_unlock(&fan_data->lock); + return 0; } @@ -488,7 +493,11 @@ MODULE_DEVICE_TABLE(of, of_gpio_fan_match); static void gpio_fan_stop(void *data) { + struct gpio_fan_data *fan_data = data; + + mutex_lock(&fan_data->lock); set_fan_speed(data, 0); + mutex_unlock(&fan_data->lock); } static int gpio_fan_probe(struct platform_device *pdev) @@ -561,7 +570,9 @@ static int gpio_fan_suspend(struct device *dev) if (fan_data->gpios) { fan_data->resume_speed = fan_data->speed_index; + mutex_lock(&fan_data->lock); set_fan_speed(fan_data, 0); + mutex_unlock(&fan_data->lock); } return 0; @@ -571,8 +582,11 @@ static int gpio_fan_resume(struct device *dev) { struct gpio_fan_data *fan_data = dev_get_drvdata(dev); - if (fan_data->gpios) + if (fan_data->gpios) { + mutex_lock(&fan_data->lock); set_fan_speed(fan_data, fan_data->resume_speed); + mutex_unlock(&fan_data->lock); + } return 0; } -- 2.39.5