mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
x11-base/xorg-server: backport BadIDChoice fix w/ MaxClients
I was hoping this would slip into a release but it hasn't yet. In any case, this fix has been on master for a while & I've been running with it for months. Closes: https://bugs.gentoo.org/857483 Closes: https://bugs.gentoo.org/875977 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -0,0 +1,59 @@
|
||||
https://bugs.gentoo.org/857483
|
||||
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
|
||||
https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
|
||||
|
||||
From f61307631203ab0266c035db07c2f776cf7c6cf4 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Fourdan <ofourdan@redhat.com>
|
||||
Date: Tue, 12 Jul 2022 14:44:48 +0200
|
||||
Subject: [PATCH] dix: Fix overzealous caching of ResourceClientBits()
|
||||
|
||||
Commit c7311654 cached the value of ResourceClientBits(), but that value
|
||||
depends on the `MaxClients` value set either from the command line or
|
||||
from the configuration file.
|
||||
|
||||
For the latter, a call to ResourceClientBits() is issued before the
|
||||
configuration file is read, meaning that the cached value is from the
|
||||
default, not from the maximum number of clients set in the configuration
|
||||
file.
|
||||
|
||||
That obviously causes all sort of issues, including memory corruption
|
||||
and crashes of the Xserver when reaching the default limit value.
|
||||
|
||||
To avoid that issue, also keep the LimitClient value, and recompute the
|
||||
ilog2() value if that changes, as on startup when the value is set from
|
||||
the the xorg.conf ServerFlags section.
|
||||
|
||||
v2: Drop the `cache == 0` test
|
||||
Rename cache vars
|
||||
|
||||
Fixes: c7311654 - dix: cache ResourceClientBits() value
|
||||
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
|
||||
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
||||
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
||||
(cherry picked from commit 2efa6d659508346358a1ef27b2393e18843f66a3)
|
||||
--- a/dix/resource.c
|
||||
+++ b/dix/resource.c
|
||||
@@ -620,12 +620,15 @@ ilog2(int val)
|
||||
unsigned int
|
||||
ResourceClientBits(void)
|
||||
{
|
||||
- static unsigned int cached = 0;
|
||||
+ static unsigned int cache_ilog2 = 0;
|
||||
+ static unsigned int cache_limit = 0;
|
||||
|
||||
- if (cached == 0)
|
||||
- cached = ilog2(LimitClients);
|
||||
+ if (LimitClients != cache_limit) {
|
||||
+ cache_limit = LimitClients;
|
||||
+ cache_ilog2 = ilog2(LimitClients);
|
||||
+ }
|
||||
|
||||
- return cached;
|
||||
+ return cache_ilog2;
|
||||
}
|
||||
|
||||
/*****************
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
195
x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild
Normal file
195
x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild
Normal file
@@ -0,0 +1,195 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
XORG_TARBALL_SUFFIX="xz"
|
||||
XORG_EAUTORECONF="no"
|
||||
inherit flag-o-matic xorg-3 meson
|
||||
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
|
||||
|
||||
DESCRIPTION="X.Org X servers"
|
||||
SLOT="0/${PV}"
|
||||
if [[ ${PV} != 9999* ]]; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
IUSE_SERVERS="xephyr xnest xorg xvfb"
|
||||
IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
CDEPEND="
|
||||
media-libs/libglvnd[X]
|
||||
dev-libs/libbsd
|
||||
dev-libs/openssl:0=
|
||||
>=x11-apps/iceauth-1.0.2
|
||||
>=x11-apps/rgb-1.0.3
|
||||
>=x11-apps/xauth-1.0.3
|
||||
x11-apps/xkbcomp
|
||||
>=x11-libs/libdrm-2.4.89
|
||||
>=x11-libs/libpciaccess-0.12.901
|
||||
>=x11-libs/libXau-1.0.4
|
||||
>=x11-libs/libXdmcp-1.0.2
|
||||
>=x11-libs/libXfont2-2.0.1
|
||||
>=x11-libs/libxkbfile-1.0.4
|
||||
>=x11-libs/libxshmfence-1.1
|
||||
>=x11-libs/pixman-0.27.2
|
||||
>=x11-misc/xbitmaps-1.0.1
|
||||
>=x11-misc/xkeyboard-config-2.4.1-r3
|
||||
xorg? (
|
||||
>=x11-libs/libxcvt-0.1.0
|
||||
)
|
||||
xnest? (
|
||||
>=x11-libs/libXext-1.0.99.4
|
||||
>=x11-libs/libX11-1.1.5
|
||||
)
|
||||
xephyr? (
|
||||
x11-libs/libxcb
|
||||
x11-libs/xcb-util
|
||||
x11-libs/xcb-util-image
|
||||
x11-libs/xcb-util-keysyms
|
||||
x11-libs/xcb-util-renderutil
|
||||
x11-libs/xcb-util-wm
|
||||
)
|
||||
!minimal? (
|
||||
>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
|
||||
>=media-libs/libepoxy-1.5.4[X,egl(+)]
|
||||
)
|
||||
udev? ( virtual/libudev:= )
|
||||
unwind? ( sys-libs/libunwind:= )
|
||||
selinux? (
|
||||
sys-process/audit
|
||||
sys-libs/libselinux:=
|
||||
)
|
||||
systemd? (
|
||||
sys-apps/dbus
|
||||
sys-apps/systemd
|
||||
)
|
||||
elogind? (
|
||||
sys-apps/dbus
|
||||
sys-auth/elogind[pam]
|
||||
sys-auth/pambase[elogind]
|
||||
)
|
||||
!!x11-drivers/nvidia-drivers[-libglvnd(+)]
|
||||
"
|
||||
DEPEND="${CDEPEND}
|
||||
>=x11-base/xorg-proto-2021.4.99.2
|
||||
>=x11-libs/xtrans-1.3.5
|
||||
media-fonts/font-util
|
||||
test? ( >=x11-libs/libxcvt-0.1.0 )
|
||||
"
|
||||
RDEPEND="${CDEPEND}
|
||||
!systemd? ( gui-libs/display-manager-init )
|
||||
selinux? ( sec-policy/selinux-xserver )
|
||||
xorg? ( >=x11-apps/xinit-1.3.3-r1 )
|
||||
"
|
||||
BDEPEND="
|
||||
sys-devel/flex
|
||||
"
|
||||
PDEPEND="
|
||||
xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
|
||||
|
||||
REQUIRED_USE="!minimal? (
|
||||
|| ( ${IUSE_SERVERS} )
|
||||
)
|
||||
elogind? ( udev )
|
||||
?? ( elogind systemd )"
|
||||
|
||||
UPSTREAMED_PATCHES=(
|
||||
# https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
|
||||
"${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${UPSTREAMED_PATCHES[@]}"
|
||||
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
|
||||
# needed for new eselect-opengl, bug #541232
|
||||
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
# bug #835653
|
||||
use x86 && replace-flags -Os -O2
|
||||
|
||||
# localstatedir is used for the log location; we need to override the default
|
||||
# from ebuild.sh
|
||||
# sysconfdir is used for the xorg.conf location; same applies
|
||||
local emesonargs=(
|
||||
--localstatedir "${EPREFIX}/var"
|
||||
--sysconfdir "${EPREFIX}/etc/X11"
|
||||
--buildtype $(usex debug debug plain)
|
||||
-Db_ndebug=$(usex debug false true)
|
||||
$(meson_use !minimal dri1)
|
||||
$(meson_use !minimal dri2)
|
||||
$(meson_use !minimal dri3)
|
||||
$(meson_use !minimal glamor)
|
||||
$(meson_use !minimal glx)
|
||||
$(meson_use udev)
|
||||
$(meson_use udev udev_kms)
|
||||
$(meson_use unwind libunwind)
|
||||
$(meson_use xcsecurity)
|
||||
$(meson_use selinux xselinux)
|
||||
$(meson_use xephyr)
|
||||
$(meson_use xnest)
|
||||
$(meson_use xorg)
|
||||
$(meson_use xvfb)
|
||||
-Ddocs=false
|
||||
-Ddrm=true
|
||||
-Ddtrace=false
|
||||
-Dipv6=true
|
||||
-Dhal=false
|
||||
-Dlinux_acpi=false
|
||||
-Dlinux_apm=false
|
||||
-Dsecure-rpc=false
|
||||
-Dsha1=libcrypto
|
||||
-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
|
||||
)
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
# Gone in 21.1.x, but not in master.
|
||||
emesonargs+=( -Dxwayland=false )
|
||||
fi
|
||||
|
||||
if use systemd || use elogind; then
|
||||
emesonargs+=(
|
||||
-Dsystemd_logind=true
|
||||
$(meson_use suid suid_wrapper)
|
||||
)
|
||||
else
|
||||
emesonargs+=(
|
||||
-Dsystemd_logind=false
|
||||
-Dsuid_wrapper=false
|
||||
)
|
||||
fi
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
# The meson build system does not support install-setuid
|
||||
if ! use systemd && ! use elogind; then
|
||||
if use suid; then
|
||||
chmod u+s "${ED}"/usr/bin/Xorg
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use xorg; then
|
||||
rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
|
||||
"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
|
||||
"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
|
||||
"${ED}"/usr/share/man/man1/Xserver.1x || die
|
||||
fi
|
||||
|
||||
# install the @x11-module-rebuild set for Portage
|
||||
insinto /usr/share/portage/config/sets
|
||||
newins "${FILESDIR}"/xorg-sets.conf xorg.conf
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Get rid of module dir to ensure opengl-update works properly
|
||||
if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
|
||||
rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
|
||||
fi
|
||||
}
|
||||
@@ -44,7 +44,7 @@ CDEPEND="
|
||||
>=x11-libs/libX11-1.1.5
|
||||
)
|
||||
xephyr? (
|
||||
x11-libs/libxcb[xkb]
|
||||
x11-libs/libxcb
|
||||
x11-libs/xcb-util
|
||||
x11-libs/xcb-util-image
|
||||
x11-libs/xcb-util-keysyms
|
||||
|
||||
Reference in New Issue
Block a user