From: Greg Kroah-Hartman Date: Wed, 29 Jul 2026 10:39:08 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.1.179~81 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1db5dbf144d1facc4dd9ca56eebb7f152aa32894;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch --- diff --git a/queue-5.15/drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch b/queue-5.15/drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch new file mode 100644 index 0000000000..09f6345311 --- /dev/null +++ b/queue-5.15/drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch @@ -0,0 +1,38 @@ +From 46c31e1604d121221167cb09380de8c7d53290b9 Mon Sep 17 00:00:00 2001 +From: Sergey Shtylyov +Date: Fri, 30 Jan 2026 23:35:42 +0300 +Subject: drm/rockchip: cdn-dp: add missing check in cdn_dp_config_video() + +From: Sergey Shtylyov + +commit 46c31e1604d121221167cb09380de8c7d53290b9 upstream. + +The result of cdn_dp_reg_write() is checked everywhere (with the error +being logged by the callers) except one place in cdn_dp_config_video(). +Add the missing result check, bailing out early on error... + +Found by Linux Verification Center (linuxtesting.org) with the Svace static +analysis tool. + +Fixes: 1a0f7ed3abe2 ("drm/rockchip: cdn-dp: add cdn DP support for rk3399") +Signed-off-by: Sergey Shtylyov +Cc: stable@vger.kernel.org +Reviewed-by: Chaoyi Chen +Signed-off-by: Heiko Stuebner +Link: https://patch.msgid.link/adf6b313-f7db-4d8f-9000-8c65446ba041@auroraos.dev +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c ++++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c +@@ -683,6 +683,8 @@ int cdn_dp_config_video(struct cdn_dp_de + val = div_u64(8 * (symbol + 1), bit_per_pix) - val; + val += 2; + ret = cdn_dp_reg_write(dp, DP_VC_TABLE(15), val); ++ if (ret) ++ goto err_config_video; + + switch (video->color_depth) { + case 6: diff --git a/queue-5.15/series b/queue-5.15/series index fad2138a29..5ca0fbdd7a 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -141,3 +141,4 @@ can-bcm-add-missing-device-refcount-for-can-filter-r.patch can-bcm-fix-stale-rx-tx-ops-after-device-removal.patch can-bcm-fix-data-race-on-rx_stamp-rx_ifindex-in-bcm_.patch can-bcm-track-a-single-source-interface-for-anydev-t.patch +drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch