]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm: bridge: cdns-mhdp8546: Fix missing mutex unlock on error path
authorQi Xi <xiqi2@huawei.com>
Thu, 4 Sep 2025 03:44:47 +0000 (11:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Oct 2025 11:35:42 +0000 (13:35 +0200)
[ Upstream commit 288dac9fb6084330d968459c750c838fd06e10e6 ]

Add missing mutex unlock before returning from the error path in
cdns_mhdp_atomic_enable().

Fixes: 935a92a1c400 ("drm: bridge: cdns-mhdp8546: Fix possible null pointer dereference")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Qi Xi <xiqi2@huawei.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20250904034447.665427-1-xiqi2@huawei.com
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c

index ae99d04f0045653ed6c1834b1c1a94f4d46d2b25..5876589d42b7d1659f0be614b1c11488d9d9c6f3 100644 (file)
@@ -1978,8 +1978,10 @@ static void cdns_mhdp_atomic_enable(struct drm_bridge *bridge,
        mhdp_state = to_cdns_mhdp_bridge_state(new_state);
 
        mhdp_state->current_mode = drm_mode_duplicate(bridge->dev, mode);
-       if (!mhdp_state->current_mode)
-               return;
+       if (!mhdp_state->current_mode) {
+               ret = -EINVAL;
+               goto out;
+       }
 
        drm_mode_set_name(mhdp_state->current_mode);