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 DA5022EEBC1; Mon, 5 May 2025 23:09:48 +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=1746486590; cv=none; b=Uu9VWz/Vh1X1AUEblQRZ1BIWfT8gMPqbgIJZ0+sKhbYHLjP05uKwEl5FoK4bekqJ6DrFzt9FIONu9rEWHg1WGQy/6CsPpKIMNUbp4kRg42eENImOm4YMRqmwL5Ht+UG7cwPqOTQ2WjYphEyZe8gdhPfEX4sbpSYtCNPAijFN09M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486590; c=relaxed/simple; bh=i4ZX910lB5hp1t0VBTT962loCDh/1AP2djcn0Tr8cFI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tjKiU8+4HqWKXa/JPthYZbnMIt6ohAX1i4hI8yI9VjrF5XpjJiuG++u0jPf8i1KG0KYnNBvPc1+WxlIKmePYyB0vpw4RbGzBfmfw+lYlph7EFXC8ljKpZIOQ1fRKTvk8YVpILm5lRlLa2gKazkuRA08XdJlqPNe0BeT80dwCik4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qhx2U2PX; 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="Qhx2U2PX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E31C5C4CEEF; Mon, 5 May 2025 23:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486588; bh=i4ZX910lB5hp1t0VBTT962loCDh/1AP2djcn0Tr8cFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qhx2U2PXqlixrRMLLQRdwL3ISoPuv/h8t7qtmodlegxH5qGXzVHm/IkuETIRZmn38 ZYtpIWJzQPnKq6HUo+zh9VYX71rPqzh7Z9LukI+AjA4XTDo2T2UDOmtNL+KjwdR7jL 8RSzhnM/2AEpfVF3X4StQdePCc2SPOVvo0e7FIXiVRIceHUuUb6IoxVrR/7QFaOHzr uI/9OKnbbWiw7yR8gRbt8Vr2/+uR1vUzCa4I9LHW6DmgNB816zZgMtroSuD6+J/QGB 469PdiMhKNBYhbj0HzmudTxGJZp6h2B4/WJ8Jpn9Jln092E0/1wTYdIzzwkphRSPJs qyJgLE+C8kZaQ== 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.1 104/212] hwmon: (gpio-fan) Add missing mutex locks Date: Mon, 5 May 2025 19:04:36 -0400 Message-Id: <20250505230624.2692522-104-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-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.1.136 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 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