rpms/xorg-x11-drv-evdev/devel evdev-2.2.1-read-deadlock.patch, NONE, 1.1 xorg-x11-drv-evdev.spec, 1.48, 1.49

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9195

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	evdev-2.2.1-read-deadlock.patch 
Log Message:
* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-2
- evdev-2.2.1-read-deadlock.patch: handle read errors on len <= 0 (#494245)



evdev-2.2.1-read-deadlock.patch:

--- NEW FILE evdev-2.2.1-read-deadlock.patch ---
>From 98ecb5233bb3b899bd696a90d2733c6a345676dd Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 6 Apr 2009 10:22:25 +1000
Subject: [PATCH] Trigger read error handling if len is <= 0.

Red Hat Bug 494245 <https://bugzilla.redhat.com/show_bug.cgi?id=494245>

Reported-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index f65359f..43a90be 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -565,7 +565,7 @@ EvdevReadInput(InputInfoPtr pInfo)
     while (len == sizeof(ev))
     {
         len = read(pInfo->fd, &ev, sizeof(ev));
-        if (len == 0)
+        if (len <= 0)
         {
             if (errno == ENODEV) /* May happen after resume */
             {
-- 
1.6.0.6



Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xorg-x11-drv-evdev.spec	24 Mar 2009 05:22:55 -0000	1.48
+++ xorg-x11-drv-evdev.spec	6 Apr 2009 00:53:12 -0000	1.49
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.2.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -17,6 +17,8 @@
 #Source0:    %{tarball}-%{gitdate}.tar.bz2
 #Source1:    make-git-snapshot.sh
 
+Patch1:     evdev-2.2.1-read-deadlock.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -34,6 +36,7 @@
 %setup -q -n %{tarball}-%{version}
 
 # apply patches
+%patch1 -p1 -b .read-deadlock
 
 %build
 autoreconf -v --install || exit 1
@@ -72,6 +75,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-2
+- evdev-2.2.1-read-deadlock.patch: handle read errors on len <= 0 (#494245)
+
 * Tue Mar 24 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.2.1-1
 - evdev 2.2.1