Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2016-05-26 23:53:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2016-05-17 17:14:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2016-05-26 23:53:53.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 24 06:20:16 UTC 2016 - [email protected] + +- U_modesetting-set-driverPrivate-to-NULL-after-closing-fd.patch: + modesetting: Avoid crash in FreeRec() by NULLing a pointer which + may still be used (boo#981268). + +------------------------------------------------------------------- New: ---- U_modesetting-set-driverPrivate-to-NULL-after-closing-fd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.QiEyaQ/_old 2016-05-26 23:53:55.000000000 +0200 +++ /var/tmp/diff_new_pack.QiEyaQ/_new 2016-05-26 23:53:55.000000000 +0200 @@ -216,6 +216,7 @@ Patch1229: U_kdrive-introduce-input-hot-plugging-support-for-udev.patch Patch1230: U_kdrive-add-options-to-set-default-XKB-properties.patch Patch1232: U_config-udev-distinguish-between-real-keyboards-and-o.patch +Patch1233: U_modesetting-set-driverPrivate-to-NULL-after-closing-fd.patch %description This package contains the X.Org Server. @@ -356,6 +357,7 @@ %patch1230 -p1 %patch1232 -p1 +%patch1233 -p1 %build test -e source-file-list || \ ++++++ U_modesetting-set-driverPrivate-to-NULL-after-closing-fd.patch ++++++ From: Dave Airlie <[email protected]> Date: Fri Apr 29 14:01:31 2016 +1000 Subject: [PATCH]modesetting: set driverPrivate to NULL after closing fd. Patch-mainline: Upstream Git-repo: git://anongit.freedesktop.org/git/xorg/xserver Git-commit: a41a171bcbae9aeafac2865faa904f15d9b59925 References: boo#981268 Signed-off-by: Egbert Eich <[email protected]> Otherwise ms_ent_priv will return NULL and things will fall apart. Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]> --- hw/xfree86/drivers/modesetting/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index c97f33a..abf7e1a 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -635,7 +635,6 @@ FreeRec(ScrnInfoPtr pScrn) ms = modesettingPTR(pScrn); if (!ms) return; - pScrn->driverPrivate = NULL; if (ms->fd > 0) { modesettingEntPtr ms_ent; @@ -656,6 +655,7 @@ FreeRec(ScrnInfoPtr pScrn) ms_ent->fd = 0; } } + pScrn->driverPrivate = NULL; free(ms->drmmode.Options); free(ms);
