aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2020-08-30 07:20:11 +0000
committerMilan P. Stanić <mps@arvanta.net>2020-08-30 12:39:37 +0000
commitaa097f0ae978febd823c307439dda7a05c77cefe (patch)
treee48daf98b5ea703175d42338ceec1efd84025f85
parent0e777ba23b0e8893bc4874c985262b3d516194e5 (diff)
downloadaports-aa097f0ae978febd823c307439dda7a05c77cefe.tar.gz
aports-aa097f0ae978febd823c307439dda7a05c77cefe.tar.bz2
aports-aa097f0ae978febd823c307439dda7a05c77cefe.tar.xz
main/xorg-server: fix segfault on ARM machines
pick patch from upstream to fix segmentation fault on some aarch64 and arm32 machines reported to upstream here: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1068 patch/commit: https://gitlab.freedesktop.org/xorg/xserver/-/commit/e50c85f4ebf559a3bac4817b41074c43d4691779
-rw-r--r--main/xorg-server/APKBUILD6
-rw-r--r--main/xorg-server/e50c85f4ebf559a3bac4817b41074c43d4691779.patch31
2 files changed, 35 insertions, 2 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index fa31dd1e86..171f38c0c6 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xorg-server
pkgver=1.20.9
-pkgrel=0
+pkgrel=1
pkgdesc="X.Org X servers"
url="https://www.x.org/wiki"
arch="all"
@@ -53,6 +53,7 @@ makedepends="
source="https://www.x.org/releases/individual/xserver/xorg-server-$pkgver.tar.bz2
xwayland-glx.patch
link-libshadow.patch
+ e50c85f4ebf559a3bac4817b41074c43d4691779.patch
"
# secfixes:
@@ -175,4 +176,5 @@ xwayland() {
}
sha512sums="d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 xorg-server-1.20.9.tar.bz2
004c9a7d920af8825a311d32433bf64190d45583d57bb20b3c5ef39d8011ced7bf17b73296e56078ca791e6cd923594dacfe3fbf7af7c98934627e34559c85d8 xwayland-glx.patch
-d0f723e6033a77faec118adc64e9d4749270724cbb2b86ca5ff796e1fbaef2d01ebcbb2904d48132b58f3ecf0781b2583744b671b17b7d51a1748f4b461932b0 link-libshadow.patch"
+d0f723e6033a77faec118adc64e9d4749270724cbb2b86ca5ff796e1fbaef2d01ebcbb2904d48132b58f3ecf0781b2583744b671b17b7d51a1748f4b461932b0 link-libshadow.patch
+e1a4c630e2bbf9ab47c81d48f2de98e302a0e3d5c2896d07804dc36eef1cd0a4e076bd2ed1be70c0d3b024501e5f540abf1b11548ede74c1af3c82183553a728 e50c85f4ebf559a3bac4817b41074c43d4691779.patch"
diff --git a/main/xorg-server/e50c85f4ebf559a3bac4817b41074c43d4691779.patch b/main/xorg-server/e50c85f4ebf559a3bac4817b41074c43d4691779.patch
new file mode 100644
index 0000000000..114076e164
--- /dev/null
+++ b/main/xorg-server/e50c85f4ebf559a3bac4817b41074c43d4691779.patch
@@ -0,0 +1,31 @@
+From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Fri, 26 Oct 2018 17:47:30 -0700
+Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system
+ with PCI.
+
+Some Broadcom set-top-box boards have PCI busses, but the GPU is still
+probed through DT. We would dereference a null busid here in that
+case.
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+---
+ hw/xfree86/common/xf86platformBus.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index cef47da03d..dadbac6c8f 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -289,7 +289,7 @@ xf86platformProbe(void)
+ for (i = 0; i < xf86_num_platform_devices; i++) {
+ char *busid = xf86_platform_odev_attributes(i)->busid;
+
+- if (pci && (strncmp(busid, "pci:", 4) == 0)) {
++ if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
+ platform_find_pci_info(&xf86_platform_devices[i], busid);
+ }
+
+--
+GitLab
+