drm/crtc: Fix uninit-value bug in drm_mode_setcrtc

From Ziqi Zhao
ff89e507b231a3afbddc2972a850947b73247a3b in linux-6.6.y/6.6.13
3823119b9c2b5f9e9b760336f75bc989b805cde6 in mainline linux

diff --git a/sys/dev/pci/drm/drm_crtc.c b/sys/dev/pci/drm/drm_crtc.c
index 0d2cbbf..d45638a 100644 (file)
--- a/sys/dev/pci/drm/drm_crtc.c
+++ b/sys/dev/pci/drm/drm_crtc.c
@@ -715,8 +715,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
        struct drm_mode_set set;
        uint32_t __user *set_connectors_ptr;
        struct drm_modeset_acquire_ctx ctx;
-       int ret;
-       int i;
+       int ret, i, num_connectors;
 
        if (!drm_core_check_feature(dev, DRIVER_MODESET))
                return -EOPNOTSUPP;
@@ -851,6 +850,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
                        goto out;
                }
 
+               num_connectors = 0;
                for (i = 0; i < crtc_req->count_connectors; i++) {
                        connector_set[i] = NULL;
                        set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
@@ -871,6 +871,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
                                        connector->name);
 
                        connector_set[i] = connector;
+                       num_connectors++;
                }
        }
 
@@ -879,7 +880,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
        set.y = crtc_req->y;
        set.mode = mode;
        set.connectors = connector_set;
-       set.num_connectors = crtc_req->count_connectors;
+       set.num_connectors = num_connectors;
        set.fb = fb;
 
        if (drm_drv_uses_atomic_modeset(dev))
@@ -892,7 +893,7 @@ out:
                drm_framebuffer_put(fb);
 
        if (connector_set) {
-               for (i = 0; i < crtc_req->count_connectors; i++) {
+               for (i = 0; i < num_connectors; i++) {
                        if (connector_set[i])
                                drm_connector_put(connector_set[i]);
                }