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 B294035C90E; Mon, 5 May 2025 22:47:12 +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=1746485232; cv=none; b=nGSJJyj+ssoU6o4+daVR0wvfvwkTe9HpQR0kix+cUlYa+YHqve70L+34zFgVWh46oGJBrq+tL5PIU1T8MEp5xRinjq9X6C9MbNGv+vYMpMcn2OTIhP6YXcYsRZh4L2AgMeAmYr3Yb82bfsRvNz6vceyyUhAXUWA3cf3TCIHQJvI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485232; c=relaxed/simple; bh=QB5BDmNQRFBOKORRB1IUyzjlT4+1l2j7PdDoCOiaFtk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cBaICYQIuylnJleL2Il2jn6FWlXq/s+ee52bWhH2++VcpaV60myYJ7OufRToccQCYhatYoq4O250boNhDkUgWvFdo2jAvhRWrNk1wrKwexTeSAxwdQi89oVoA+GVP9oBMoflxD2/TC5yxCekobhc2Ma5S8wmercmi57LSoBE1yo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BK6GzS4g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BK6GzS4g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 629C4C4CEED; Mon, 5 May 2025 22:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485232; bh=QB5BDmNQRFBOKORRB1IUyzjlT4+1l2j7PdDoCOiaFtk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BK6GzS4gn3Eu4I4+aHTkNgZ4LWb/UcD9cV3M4acIGkSfr6do5KyTVEapYsrVDz30q 0YjGtF8goeglcEwN60YIuARP8GJimsvlUP/JJhk2MU2YRLpEX9msXoIZzefekw3Q0A MbUNv6HcRxXMHjlX0/o6ITSnsGsm5Z7wm8xN83ePUEOy8DyMqucMNv5tvmejUg41St gKUPMMV+1s7TZa2326fxiHcKQe95FfuAfXPAU4JdwMi12rqJZnNH9zW4ARzpfVd20h QjtSyp8MImeZvBUJ2KR+HJHdNW/VtalP7MRQk/w4MJMsSry+WCsAdMMLFnnOnaWVPa E/lQNH3pzEFeA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Stein , Guenter Roeck , Sasha Levin , jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 224/486] hwmon: (gpio-fan) Add missing mutex locks Date: Mon, 5 May 2025 18:35:00 -0400 Message-Id: <20250505223922.2682012-224-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.26 Content-Transfer-Encoding: 8bit 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 d92c536be9af7..b779240328d59 100644 --- a/drivers/hwmon/gpio-fan.c +++ b/drivers/hwmon/gpio-fan.c @@ -393,7 +393,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; } @@ -489,7 +494,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) @@ -562,7 +571,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; @@ -572,8 +583,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