mirror of
https://github.com/X11Libre/xserver.git
synced 2026-11-20 06:12:29 +00:00
test: list: cover zero-initialized xorg_list heads
Some checks failed
Build X servers / ubuntu-fetch-pkg (push) Has been cancelled
Build X servers / xserver-build-ubuntu-no-gbm (push) Has been cancelled
Build X servers / xserver-build-ubuntu (push) Has been cancelled
Build X servers / abi-changes-check (push) Has been cancelled
Build X servers / drivers-prepare-ubuntu (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-elographics:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-evdev:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-joystick:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-keyboard:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-libinput:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-mouse:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-synaptics:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-vmmouse:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-void:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-wacom:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-amdgpu:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-apm:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-ark:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-ast:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-ati:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-chips:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-cirrus:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-dummy:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-fbdev:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-freedreno:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-geode:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-i128:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-i740:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-intel:25.0.1) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-mach64:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-mga:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-neomagic:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-nested:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-nouveau:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-nv:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-omap:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-qxl:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-r128:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-rendition:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-s3virge:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-savage:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-siliconmotion:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-sis:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-sisusb:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-suncg14:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-suncg3:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-suncg6:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-sunffb:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-sunleo:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-suntcx:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-tdfx:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-trident:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-v4l:25.0.1) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-vbox:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-vesa:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-vmware:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-voodoo:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-xgi:25.0.0) (push) Has been cancelled
Build X servers / xserver-build-mingw32-ubuntu (push) Has been cancelled
Build X servers / xserver-build-macos (push) Has been cancelled
Build X servers / xserver-build-freebsd (push) Has been cancelled
Build X servers / xserver-build-dragonflybsd (push) Has been cancelled
Build X servers / xserver-build-netbsd (push) Has been cancelled
Build X servers / xserver-build-alpine (push) Has been cancelled
Build X servers / xserver-build-cygwin (push) Has been cancelled
Build X servers / xserver-build-arch (push) Has been cancelled
Build X servers / Check Signed-Off-By (push) Has been cancelled
Build X servers / Release pushed tag (push) Has been cancelled
check PRs for merge conflicts / notify (push) Has been cancelled
Some checks failed
Build X servers / ubuntu-fetch-pkg (push) Has been cancelled
Build X servers / xserver-build-ubuntu-no-gbm (push) Has been cancelled
Build X servers / xserver-build-ubuntu (push) Has been cancelled
Build X servers / abi-changes-check (push) Has been cancelled
Build X servers / drivers-prepare-ubuntu (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-elographics:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-evdev:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-joystick:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-keyboard:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-libinput:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-mouse:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-synaptics:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-vmmouse:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-void:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (input-wacom:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-amdgpu:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-apm:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-ark:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-ast:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-ati:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-chips:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-cirrus:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-dummy:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-fbdev:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-freedreno:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-geode:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-i128:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-i740:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-intel:25.0.1) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-mach64:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-mga:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-neomagic:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-nested:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-nouveau:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-nv:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-omap:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-qxl:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-r128:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-rendition:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-s3virge:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-savage:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-siliconmotion:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-sis:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-sisusb:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-suncg14:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-suncg3:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-suncg6:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-sunffb:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-sunleo:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-suntcx:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-tdfx:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-trident:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-v4l:25.0.1) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-vbox:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-vesa:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-vmware:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-voodoo:25.0.0) (push) Has been cancelled
Build X servers / drivers-build-ubuntu (video-xgi:25.0.0) (push) Has been cancelled
Build X servers / xserver-build-mingw32-ubuntu (push) Has been cancelled
Build X servers / xserver-build-macos (push) Has been cancelled
Build X servers / xserver-build-freebsd (push) Has been cancelled
Build X servers / xserver-build-dragonflybsd (push) Has been cancelled
Build X servers / xserver-build-netbsd (push) Has been cancelled
Build X servers / xserver-build-alpine (push) Has been cancelled
Build X servers / xserver-build-cygwin (push) Has been cancelled
Build X servers / xserver-build-arch (push) Has been cancelled
Build X servers / Check Signed-Off-By (push) Has been cancelled
Build X servers / Release pushed tag (push) Has been cancelled
check PRs for merge conflicts / notify (push) Has been cancelled
Add regression tests for xorg_list operations on a *zero-initialized* list head (next == prev == NULL), i.e. a head embedded in a calloc()'d struct that was never run through xorg_list_init(). Covers the paths hardened in the preceding commit, so the gap found while repairing #1639 (a never-init'd client->saveSets crashing DeleteWindowFromAnySaveSet() via xorg_list_for_each_entry_safe()) cannot silently regress: - xorg_list_del() on a zeroed head (the documented "reset to empty list") - xorg_list_for_each_entry_safe() over a zeroed/empty head - add + safe-delete drain starting from a zeroed head Without the macro fix these dereference NULL and crash; run_test_in_child() forks per test, so the crash surfaces as a unit-test failure (verified: the test fails at both -O0 and -O2 on the pre-fix tree, passes with the fix). Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
e033a9f697
commit
ae2cfcdee3
4 changed files with 143 additions and 0 deletions
140
test/list_zeroinit.c
Normal file
140
test/list_zeroinit.c
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
/* SPDX-License-Identifier: MIT OR X11
|
||||
*
|
||||
* Copyright © 2026 Enrico Weigelt, metux IT consult <info@metux.net>
|
||||
*
|
||||
* Regression tests for xorg_list operations on a *zero-initialized* list head
|
||||
* (next == prev == NULL), i.e. a head embedded in a calloc()'d struct that was
|
||||
* never run through xorg_list_init(). Several xorg_list operations are
|
||||
* documented to tolerate this; these tests pin that contract down so it can't
|
||||
* silently regress.
|
||||
*
|
||||
* Background: a client->saveSets head that was merely zero-allocated crashed
|
||||
* the server (signal 11 at address 0x0) in DeleteWindowFromAnySaveSet(), which
|
||||
* walks every client's list with xorg_list_for_each_entry_safe(). The macro
|
||||
* computed its `tmp` seed by dereferencing container_of(NULL) *before* its
|
||||
* NULL-guarded loop condition was ever evaluated, and xorg_list_del() reset a
|
||||
* head by dereferencing entry->prev/next directly. Both now cope with a zeroed
|
||||
* head; the cases below would SIGSEGV (the harness forks per test, so a crash
|
||||
* is reported as a failure) without that fix.
|
||||
*/
|
||||
|
||||
/* Tests rely on assert() */
|
||||
#undef NDEBUG
|
||||
|
||||
#include <dix-config.h>
|
||||
|
||||
#include <list.h>
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "tests-common.h"
|
||||
|
||||
struct parent {
|
||||
int a;
|
||||
struct xorg_list children;
|
||||
int b;
|
||||
};
|
||||
|
||||
struct child {
|
||||
int id;
|
||||
struct xorg_list node;
|
||||
};
|
||||
|
||||
/*
|
||||
* xorg_list_for_each_entry_safe() over a zero-initialized head must iterate
|
||||
* zero times and must not dereference anything (the old macro computed its
|
||||
* `tmp` seed from container_of(NULL) before the loop guard ran -> NULL deref).
|
||||
*/
|
||||
static void
|
||||
test_xorg_list_zeroinit_for_each_entry_safe_empty(void)
|
||||
{
|
||||
struct parent parent;
|
||||
struct child *pos, *tmp;
|
||||
int count = 0;
|
||||
|
||||
memset(&parent, 0, sizeof(parent));
|
||||
assert(parent.children.next == NULL && parent.children.prev == NULL);
|
||||
|
||||
xorg_list_for_each_entry_safe(pos, tmp, &parent.children, node)
|
||||
count++;
|
||||
|
||||
assert(count == 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* xorg_list_del() on a zero-initialized head is the documented "reset to empty
|
||||
* list" use; it must not dereference NULL prev/next and must leave a valid,
|
||||
* empty, self-linked head behind.
|
||||
*/
|
||||
static void
|
||||
test_xorg_list_zeroinit_del(void)
|
||||
{
|
||||
/* on the heap, to model a head embedded in a calloc()'d struct */
|
||||
struct parent *parent = calloc(1, sizeof(*parent));
|
||||
|
||||
assert(parent);
|
||||
assert(parent->children.next == NULL && parent->children.prev == NULL);
|
||||
|
||||
xorg_list_del(&parent->children);
|
||||
|
||||
assert(xorg_list_is_empty(&parent->children));
|
||||
|
||||
/* the head is now usable as a normal list */
|
||||
struct child c = { .id = 42 };
|
||||
struct child *first;
|
||||
xorg_list_add(&c.node, &parent->children);
|
||||
assert(!xorg_list_is_empty(&parent->children));
|
||||
first = xorg_list_first_entry(&parent->children, struct child, node);
|
||||
assert(first->id == 42);
|
||||
|
||||
free(parent);
|
||||
}
|
||||
|
||||
/*
|
||||
* The exact DeleteWindowFromAnySaveSet() shape: a zero-initialized head that
|
||||
* had entries appended (xorg_list_add() auto-inits), then drained with the safe
|
||||
* iterator. Exercises both the auto-init-on-add and the safe-walk-and-delete
|
||||
* paths starting from a never-explicitly-init'd head.
|
||||
*/
|
||||
static void
|
||||
test_xorg_list_zeroinit_add_then_safe_delete(void)
|
||||
{
|
||||
struct parent parent;
|
||||
struct child child[3] = { { .id = 0 }, { .id = 1 }, { .id = 2 } };
|
||||
struct child *pos, *tmp;
|
||||
int seen = 0;
|
||||
|
||||
memset(&parent, 0, sizeof(parent));
|
||||
|
||||
for (int i = 0; i < 3; i++)
|
||||
xorg_list_add(&child[i].node, &parent.children);
|
||||
|
||||
xorg_list_for_each_entry_safe(pos, tmp, &parent.children, node) {
|
||||
xorg_list_del(&pos->node);
|
||||
seen++;
|
||||
}
|
||||
|
||||
assert(seen == 3);
|
||||
assert(xorg_list_is_empty(&parent.children));
|
||||
}
|
||||
|
||||
const testfunc_t*
|
||||
list_zeroinit_test(void)
|
||||
{
|
||||
static const testfunc_t testfuncs[] = {
|
||||
/*
|
||||
* Order matters for failure reporting: the test harness
|
||||
* (run_test_in_child) reuses a stale exit code across the functions of
|
||||
* a suite, so a crash is only surfaced as a non-zero exit when it hits
|
||||
* the *first* function. xorg_list_del() on a zeroed head is the most
|
||||
* reliable pre-fix crash (a store through a NULL prev/next, not elided
|
||||
* at any optimization level), so it goes first.
|
||||
*/
|
||||
test_xorg_list_zeroinit_del,
|
||||
test_xorg_list_zeroinit_for_each_entry_safe_empty,
|
||||
test_xorg_list_zeroinit_add_then_safe_delete,
|
||||
NULL,
|
||||
};
|
||||
return testfuncs;
|
||||
}
|
||||
|
|
@ -179,6 +179,7 @@ if build_xorg
|
|||
'fixes.c',
|
||||
'input.c',
|
||||
'list.c',
|
||||
'list_zeroinit.c',
|
||||
'misc.c',
|
||||
'sha1.c',
|
||||
'signal-logging.c',
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ int
|
|||
main(int argc, char **argv)
|
||||
{
|
||||
run_test(list_test);
|
||||
run_test(list_zeroinit_test);
|
||||
run_test(sha1_test);
|
||||
run_test(string_test);
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ const testfunc_t* fixes_test(void);
|
|||
const testfunc_t* hashtabletest_test(void);
|
||||
const testfunc_t* input_test(void);
|
||||
const testfunc_t* list_test(void);
|
||||
const testfunc_t* list_zeroinit_test(void);
|
||||
const testfunc_t* misc_test(void);
|
||||
const testfunc_t* sha1_test(void);
|
||||
const testfunc_t* signal_logging_test(void);
|
||||
|
|
|
|||
Loading…
Reference in a new issue