Add a test for EVIOCREVOKE

New in 3.12, EVIOCREVOKE revokes access to an evdev device. This is unlikely
to be used by a libevdev user, see.
http://lists.freedesktop.org/archives/input-tools/2014-January/000688.html

This patch adds a new test-kernel binary that tests the kernel API directly.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>

diff --git a/test/.gitignore b/test/.gitignore
index 42cb139..4b0ab3e 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -2,3 +2,4 @@ gcov-report.txt
 test-libevdev
 test-link
 test-compile-pedantic
+test-kernel

diff --git a/test/Makefile.am b/test/Makefile.am
index 3e81169..fe5cfa9 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,5 @@
 if BUILD_TESTS
-run_tests = test-libevdev
+run_tests = test-libevdev test-kernel
 build_tests = test-compile-pedantic test-link
 
 noinst_PROGRAMS = $(run_tests) $(build_tests)
@@ -43,6 +43,14 @@ test_link_SOURCES = test-link.c
 test_link_CFLAGS = -I$(top_srcdir)
 test_link_LDADD = $(top_builddir)/libevdev/libevdev.la
 
+test_kernel_SOURCES = \
+                     test-kernel.c \
+                     $(common_sources)
+test_kernel_CFLAGS = -I$(top_srcdir)
+test_kernel_LDADD = \
+                   $(CHECK_LIBS) \
+                   $(top_builddir)/libevdev/libevdev.la
+
 if GCOV_ENABLED
 
 CLEANFILES = gcov-report.txt

diff --git a/test/test-kernel.c b/test/test-kernel.c
new file mode 100644 (file)
index 0000000..c912082
--- /dev/null
+++ b/test/test-kernel.c
@@ -0,0 +1,189 @@
+/*
+ * Copyright © 2014 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <linux/input.h>
+
+#include <libevdev/libevdev.h>
+#include <libevdev/libevdev-uinput.h>
+#include "test-common.h"
+
+START_TEST(test_revoke)
+{
+       struct uinput_device* uidev;
+       struct libevdev *dev, *dev2;
+       int rc, fd;
+       struct input_event ev1, ev2;
+       int dev_fd;
+
+       rc = test_create_device(&uidev, &dev,
+                               EV_SYN, SYN_REPORT,
+                               EV_REL, REL_X,
+                               EV_REL, REL_Y,
+                               EV_REL, REL_WHEEL,
+                               EV_KEY, BTN_LEFT,
+                               EV_KEY, BTN_MIDDLE,
+                               EV_KEY, BTN_RIGHT,
+                               -1);
+       ck_assert_msg(rc == 0, "Failed to create device: %s", strerror(-rc));
+
+       fd = open(uinput_device_get_devnode(uidev), O_RDONLY|O_NONBLOCK);
+       ck_assert_int_gt(fd, -1);
+       rc = libevdev_new_from_fd(fd, &dev2);
+       ck_assert_msg(rc == 0, "Failed to create second device: %s", strerror(-rc));
+
+       uinput_device_event(uidev, EV_REL, REL_X, 1);
+       uinput_device_event(uidev, EV_SYN, SYN_REPORT, 0);
+
+       rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &ev1);
+       ck_assert_int_eq(rc, LIBEVDEV_READ_STATUS_SUCCESS);
+
+       rc = libevdev_next_event(dev2, LIBEVDEV_READ_FLAG_NORMAL, &ev2);
+       ck_assert_int_eq(rc, LIBEVDEV_READ_STATUS_SUCCESS);
+
+       ck_assert_int_eq(ev1.type, ev2.type);
+       ck_assert_int_eq(ev1.code, ev2.code);
+       ck_assert_int_eq(ev1.value, ev2.value);
+
+       /* revoke first device, expect it closed, second device still open */
+       dev_fd = libevdev_get_fd(dev);
+       ck_assert_int_ge(dev_fd, 0);
+       rc = ioctl(dev_fd, EVIOCREVOKE, NULL);
+       if (rc == -1 && errno == -EINVAL) {
+               fprintf(stderr, "WARNING: skipping EVIOCREVOKE test, not suported by current kernel\n");
+               goto out;
+       }
+       ck_assert_msg(rc == 0, "Failed to revoke device: %s", strerror(errno));
+
+       rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &ev1);
+       ck_assert_int_eq(rc, -ENODEV);
+
+       rc = libevdev_next_event(dev2, LIBEVDEV_READ_FLAG_NORMAL, &ev2);
+       ck_assert_int_eq(rc, LIBEVDEV_READ_STATUS_SUCCESS);
+
+out:
+       uinput_device_free(uidev);
+       libevdev_free(dev);
+       libevdev_free(dev2);
+       close(fd);
+}
+END_TEST
+
+START_TEST(test_revoke_invalid)
+{
+       struct uinput_device* uidev;
+       struct libevdev *dev;
+       int rc;
+       int dev_fd;
+
+       rc = test_create_device(&uidev, &dev,
+                               EV_SYN, SYN_REPORT,
+                               EV_REL, REL_X,
+                               EV_REL, REL_Y,
+                               EV_REL, REL_WHEEL,
+                               EV_KEY, BTN_LEFT,
+                               EV_KEY, BTN_MIDDLE,
+                               EV_KEY, BTN_RIGHT,
+                               -1);
+       ck_assert_msg(rc == 0, "Failed to create device: %s", strerror(-rc));
+
+       dev_fd = libevdev_get_fd(dev);
+       ck_assert_int_ge(dev_fd, 0);
+       /* ioctl requires 0 as value */
+       rc = ioctl(dev_fd, EVIOCREVOKE, 1);
+       ck_assert_int_eq(rc, -1);
+       ck_assert_int_eq(errno, EINVAL);
+
+       uinput_device_free(uidev);
+       libevdev_free(dev);
+}
+END_TEST
+
+START_TEST(test_revoke_fail_after)
+{
+       struct uinput_device* uidev;
+       struct libevdev *dev, *dev2;
+       int rc, fd;
+
+       rc = test_create_device(&uidev, &dev,
+                               EV_SYN, SYN_REPORT,
+                               EV_REL, REL_X,
+                               EV_REL, REL_Y,
+                               EV_REL, REL_WHEEL,
+                               EV_KEY, BTN_LEFT,
+                               EV_KEY, BTN_MIDDLE,
+                               EV_KEY, BTN_RIGHT,
+                               -1);
+       ck_assert_msg(rc == 0, "Failed to create device: %s", strerror(-rc));
+
+       fd = open(uinput_device_get_devnode(uidev), O_RDONLY|O_NONBLOCK);
+       ck_assert_int_gt(fd, -1);
+
+       rc = ioctl(fd, EVIOCREVOKE, NULL);
+       if (rc == -1 && errno == -EINVAL) {
+               fprintf(stderr, "WARNING: skipping EVIOCREVOKE test, not suported by current kernel\n");
+               goto out;
+       }
+       ck_assert_msg(rc == 0, "Failed to revoke device: %s", strerror(errno));
+
+       rc = libevdev_new_from_fd(fd, &dev2);
+       ck_assert_int_eq(rc, -ENODEV);
+
+out:
+       uinput_device_free(uidev);
+       libevdev_free(dev);
+       libevdev_free(dev2);
+       close(fd);
+}
+END_TEST
+
+int main(int argc, char **argv)
+{
+       SRunner *sr;
+       Suite *s;
+       TCase *tc;
+       int failed;
+
+       s = suite_create("kernel tests");
+
+       tc = tcase_create("EVIOCREVOKE");
+       tcase_add_test(tc, test_revoke);
+       tcase_add_test(tc, test_revoke_invalid);
+       tcase_add_test(tc, test_revoke_fail_after);
+       suite_add_tcase(s, tc);
+
+       sr = srunner_create(s);
+       srunner_run_all(sr, CK_NORMAL);
+
+       failed = srunner_ntests_failed(sr);
+       srunner_free(sr);
+
+       return failed;
+}