Hello community,
here is the log from the commit of package xf86-input-vmmouse for
openSUSE:Factory checked in at 2015-03-23 12:13:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-vmmouse (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-vmmouse.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-vmmouse"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-vmmouse/xf86-input-vmmouse.changes
2014-10-15 16:19:38.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-input-vmmouse.new/xf86-input-vmmouse.changes
2015-03-23 12:13:25.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 18 13:58:11 UTC 2015 - [email protected]
+
+- U_Don-t-de-reference-pMse-if-it-hasn-t-been-initialise.patch
+ * fixes X server crash being started by valgrind (bnc#922188)
+
+-------------------------------------------------------------------
New:
----
U_Don-t-de-reference-pMse-if-it-hasn-t-been-initialise.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-vmmouse.spec ++++++
--- /var/tmp/diff_new_pack.fuZwL2/_old 2015-03-23 12:13:26.000000000 +0100
+++ /var/tmp/diff_new_pack.fuZwL2/_new 2015-03-23 12:13:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xf86-input-vmmouse
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,7 @@
Patch2: u_Don-t-access-hardware-register-while-switched-away.patch
Patch3: U_Free-the-vmmouse-data-on-UnInit.patch
Patch4: u_vmmouse_client.h-Include-xorg-server.h-before-xf86_O.patch
+Patch5: U_Don-t-de-reference-pMse-if-it-hasn-t-been-initialise.patch
BuildRequires: pkg-config
# For directory ownership
BuildRequires: udev
@@ -61,6 +62,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%configure --with-xorg-conf-dir=/etc/X11/xorg.conf.d
--with-udev-rules-dir=%{_udevrulesdir}
++++++ U_Don-t-de-reference-pMse-if-it-hasn-t-been-initialise.patch ++++++
>From 9a815289f9df5577f5fdf4c2463b614a93819b7d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <[email protected]>
Date: Mon, 11 Feb 2013 15:27:26 +1000
Subject: [PATCH] Don't de-reference pMse if it hasn't been initialised yet
If the device fails PreInit, UnInit is still called by pMse may be NULL.
Dereferencing it is a bad idea.
Reviewed-by: Jakob Bornecrantz <[email protected]>
Signed-off-by: Jakob Bornecrantz <[email protected]>
Signed-off-by: Peter Hutterer <[email protected]>
---
src/vmmouse.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/vmmouse.c b/src/vmmouse.c
index fb053c2..523f4fd 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -808,11 +808,13 @@ static void
VMMouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
MouseDevPtr pMse = pInfo->private;
- VMMousePrivPtr mPriv = (VMMousePrivPtr)pMse->mousePriv;
xf86Msg(X_INFO, "VMWARE(0): VMMouseUnInit\n");
- free(mPriv);
+ if (pMse) {
+ VMMousePrivPtr mPriv = (VMMousePrivPtr)pMse->mousePriv;
+ free(mPriv);
+ }
xf86DeleteInput(pInfo, flags);
}
--
1.8.4.5
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
