]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jul 2026 10:38:56 +0000 (12:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jul 2026 10:38:56 +0000 (12:38 +0200)
added patches:
drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch

queue-5.10/drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch b/queue-5.10/drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch
new file mode 100644 (file)
index 0000000..09f6345
--- /dev/null
@@ -0,0 +1,38 @@
+From 46c31e1604d121221167cb09380de8c7d53290b9 Mon Sep 17 00:00:00 2001
+From: Sergey Shtylyov <s.shtylyov@auroraos.dev>
+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 <s.shtylyov@auroraos.dev>
+
+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 <s.shtylyov@auroraos.dev>
+Cc: stable@vger.kernel.org
+Reviewed-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
+Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Link: https://patch.msgid.link/adf6b313-f7db-4d8f-9000-8c65446ba041@auroraos.dev
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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:
index 873512179e20b3980db34f5ccb2aa458efea2810..bcfe68411ee9b2b4da4c847b9d8b82208da4945b 100644 (file)
@@ -98,6 +98,7 @@ net-mlx5-e-switch-fix-zero-num_dest-in-prio_tag-egre.patch
 net-mlx5e-report-zero-bandwidth-for-non-ets-traffic-.patch
 net-mlx5e-reject-unsupported-cb-shaper-tsa-in-ets-va.patch
 raw-use-more-conventional-iterators.patch
+drm-rockchip-cdn-dp-add-missing-check-in-cdn_dp_config_video.patch
 net-ipv6-fix-dif-and-sdif-mismatch-in-raw6_icmp_erro.patch
 bpf-sockmap-fix-cork-use-after-free-in-tcp_bpf_sendm.patch
 can-bcm-defer-rx_op-deallocation-to-workqueue-to-fix.patch