From b096785df4bde7ff6a012d35fbbeb197f9734fff Mon Sep 17 00:00:00 2001 From: Mikhail Dmitrichenko Date: Wed, 17 Sep 2025 17:00:51 +0300 Subject: [PATCH] xwayland: Fix search of duplicate lease names Commit d36f66f15d ("Check for duplicate output names") would walk the list of existing outputs and leases to check that no other existing output has the same name. The change however, inadvertently reused the regular screen outputs when searching the leased names. Fix this by using the lease name, not the regular output names that we already checked just above. Found by SAST tool Svace. Fixes: d36f66f15d - xwayland: Check for duplicate output names Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1843 Reviewed-by Olivier Fourdan Signed-off-by: Mikhail Dmitrichenko Part-of: --- hw/xwayland/xwayland-output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c index dd0d716907..715eff3ea8 100644 --- a/hw/xwayland/xwayland-output.c +++ b/hw/xwayland/xwayland-output.c @@ -721,7 +721,7 @@ xwl_output_set_name(struct xwl_output *xwl_output, const char *name) /* And leases' names as well */ xorg_list_for_each_entry(lease, &pScrPriv->leases, list) { for (i = 0; i < lease->numOutputs; i++) { - if (!strcmp(name, pScrPriv->outputs[i]->name)) { + if (!strcmp(name, lease->outputs[i]->name)) { ErrorF("A lease output named '%s' already exists", name); return; }