Blame 0202-logind-fix-sd_eviocrevoke-ioctl-call.patch
|
|
e1b4cbe |
From 2b5a60aca874ab526d33912391ea491c267d246f Mon Sep 17 00:00:00 2001
|
|
|
e1b4cbe |
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
e1b4cbe |
Date: Thu, 22 Jan 2015 11:36:02 +1000
|
|
|
e1b4cbe |
Subject: [PATCH] logind: fix sd_eviocrevoke ioctl call
|
|
|
e1b4cbe |
|
|
|
e1b4cbe |
If the third argument is non-null, the kernel will always error out with
|
|
|
e1b4cbe |
EINVAL and devices won't get revoked.
|
|
|
e1b4cbe |
|
|
|
e1b4cbe |
Reported-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
|
|
|
e1b4cbe |
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
e1b4cbe |
(cherry picked from commit 8dbce34b0373923c7aa7d795024bbedb0a85c7ea)
|
|
|
e1b4cbe |
---
|
|
|
e1b4cbe |
src/login/logind-session-device.c | 2 +-
|
|
|
e1b4cbe |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
e1b4cbe |
|
|
|
e1b4cbe |
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
|
|
|
e1b4cbe |
index 932abb82f9..c2de862250 100644
|
|
|
e1b4cbe |
--- a/src/login/logind-session-device.c
|
|
|
e1b4cbe |
+++ b/src/login/logind-session-device.c
|
|
|
e1b4cbe |
@@ -107,7 +107,7 @@ static int sd_eviocrevoke(int fd) {
|
|
|
e1b4cbe |
|
|
|
e1b4cbe |
assert(fd >= 0);
|
|
|
e1b4cbe |
|
|
|
e1b4cbe |
- r = ioctl(fd, EVIOCREVOKE, 1);
|
|
|
e1b4cbe |
+ r = ioctl(fd, EVIOCREVOKE, NULL);
|
|
|
e1b4cbe |
if (r < 0) {
|
|
|
e1b4cbe |
r = -errno;
|
|
|
e1b4cbe |
if (r == -EINVAL && !warned) {
|