xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/drmmode_display.c |   11 ++++++++---
 meson.build                                      |    2 ++
 test/sync/sync.c                                 |   14 +++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 2e6f3a632b349e551c4688433309f9d30b4ea00a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Aug 28 13:24:08 2024 +0200

    meson.build: enable VLA warning
    
    variable length arrays can be dangerous, so better don't use
    them at all.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1819>

diff --git a/meson.build b/meson.build
index e95743ff9..67abb482d 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,7 @@ cc = meson.get_compiler('c')
 
 add_project_arguments('-fno-strict-aliasing', language : 'c')
 add_project_arguments('-fvisibility=hidden', language : 'c')
+add_project_arguments('-Wvla', language: 'c')
 
 add_project_link_arguments('-fvisibility=hidden', language : 'c')
 
@@ -46,6 +47,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
         '-Werror=address',
         '-Werror=int-to-pointer-cast',
         '-Werror=pointer-to-int-cast',
+        '-Wvla',
     ]
 else
     test_wflags = []
commit b4f0c1abd51878dca6ccea26c282ebe804ce2eb0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 20 16:11:04 2025 +0100

    test: sync: don't use VLA
    
    The array size is fixed anyways, so we can use a symbol instead
    of variable.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1819>

diff --git a/test/sync/sync.c b/test/sync/sync.c
index bd1b0addd..fcb2a4a52 100644
--- a/test/sync/sync.c
+++ b/test/sync/sync.c
@@ -124,19 +124,19 @@ test_set_counter(xcb_connection_t *c)
 static void
 test_change_counter_basic(xcb_connection_t *c)
 {
-    int iterations = 4;
-    xcb_sync_query_counter_cookie_t queries[iterations];
+#define T1_ITERATIONS 4
+    xcb_sync_query_counter_cookie_t queries[T1_ITERATIONS];
 
     xcb_sync_counter_t counter = xcb_generate_id(c);
     xcb_sync_create_counter(c, counter, sync_value(0));
 
-    for (int i = 0; i < iterations; i++) {
+    for (int i = 0; i < T1_ITERATIONS; i++) {
         xcb_sync_change_counter(c, counter, sync_value(i));
         queries[i] = xcb_sync_query_counter_unchecked(c, counter);
     }
 
     int64_t expected_value = 0;
-    for (int i = 0; i < iterations; i++) {
+    for (int i = 0; i < T1_ITERATIONS; i++) {
         expected_value += i;
         int64_t value = counter_value(c, queries[i]);
 
@@ -154,9 +154,9 @@ test_change_counter_basic(xcb_connection_t *c)
 static void
 test_change_counter_overflow(xcb_connection_t *c)
 {
-    int iterations = 4;
-    xcb_sync_query_counter_cookie_t queries[iterations];
-    xcb_void_cookie_t changes[iterations];
+#define T2_ITERATIONS 4
+    xcb_sync_query_counter_cookie_t queries[T2_ITERATIONS];
+    xcb_void_cookie_t changes[T2_ITERATIONS];
     static const struct {
         int64_t a, b;
     } overflow_args[] = {
commit f894801fa20ccf342656c815a56d266e81ca4aac
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 20 17:25:15 2025 +0100

    xfree86: modesetting: don't use VLA
    
    even through this specific case is correct and safe, it's safer to
    remove all VLA usages and forbid them completely by compiler flag.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1819>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 2072ce0c5..cf4269403 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1910,8 +1910,9 @@ drmmode_set_gamma_lut(drmmode_crtc_private_ptr drmmode_crtc,
     drmmode_prop_info_ptr gamma_lut_info =
         &drmmode_crtc->props[DRMMODE_CRTC_GAMMA_LUT];
     const uint32_t crtc_id = drmmode_crtc->mode_crtc->crtc_id;
-    uint32_t blob_id;
-    struct drm_color_lut lut[size];
+    struct drm_color_lut *lut = calloc(size, sizeof(struct drm_color_lut));
+    if (!lut)
+        return;
 
     assert(gamma_lut_info->prop_id != 0);
 
@@ -1922,13 +1923,17 @@ drmmode_set_gamma_lut(drmmode_crtc_private_ptr drmmode_crtc,
         lut[i].reserved = 0;
     }
 
-    if (drmModeCreatePropertyBlob(drmmode->fd, lut, sizeof(lut), &blob_id))
+    uint32_t blob_id;
+    if (drmModeCreatePropertyBlob(drmmode->fd, lut, sizeof(lut), &blob_id)) {
+        free(lut);
         return;
+    }
 
     drmModeObjectSetProperty(drmmode->fd, crtc_id, DRM_MODE_OBJECT_CRTC,
                              gamma_lut_info->prop_id, blob_id);
 
     drmModeDestroyPropertyBlob(drmmode->fd, blob_id);
+    free(lut);
 }
 
 static void