summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>2024-12-06 11:43:05 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-02-17 11:35:57 +0100
commit4ef005242631e3a236b8e05b67cf2c98d54f6418 (patch)
tree397660afe6edfeb47bf223f57ac5f901085dd307
parent7608bc96cd02ef23bb5d47d5e9fec911c3ef07ae (diff)
downloadlinux-4ef005242631e3a236b8e05b67cf2c98d54f6418.tar.gz
linux-4ef005242631e3a236b8e05b67cf2c98d54f6418.tar.bz2
linux-4ef005242631e3a236b8e05b67cf2c98d54f6418.zip
drm/bridge: anx7625: use eld_mutex to protect access to connector->eld
[ Upstream commit e72bf423a60afd744d13e40ab2194044a3af5217 ] Reading access to connector->eld can happen at the same time the drm_edid_to_eld() updates the data. Take the newly added eld_mutex in order to protect connector->eld from concurrent access. Reviewed-by: Maxime Ripard <mripard@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20241206-drm-connector-eld-mutex-v2-2-c9bce1ee8bea@linaro.org Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/gpu/drm/bridge/analogix/anx7625.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index a2675b121fe4..c036bbc92ba9 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -2002,8 +2002,10 @@ static int anx7625_audio_get_eld(struct device *dev, void *data,
memset(buf, 0, len);
} else {
dev_dbg(dev, "audio copy eld\n");
+ mutex_lock(&ctx->connector->eld_mutex);
memcpy(buf, ctx->connector->eld,
min(sizeof(ctx->connector->eld), len));
+ mutex_unlock(&ctx->connector->eld_mutex);
}
return 0;