commit 9602a8cd73182f948523f929a9db0d31c9774b45
author Michael Wright <michaelwr@google.com> Fri Feb 10 00:23:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 10 00:23:57 2017 +0000
tree c5c5caeca6b3d495f9a4f0da87190e93075954e5
parent da5d78d81196c44cef1914df4ecec87f321e0290
parent 9024452a4e925e721e3f31fccbe564a7c72ecd5a

Merge "Only allow system to write to existing input nodes." am: bab6ec555c am: f5951632d0
am: c848a8de8e

Change-Id: I232125491a48d1aa84d3a59c94c862007f8890b2

rootdir/ueventd.rc

diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
index 0633a68..3b64f6d 100644
--- a/rootdir/ueventd.rc
+++ b/rootdir/ueventd.rc
@@ -46,7 +46,7 @@
 /dev/tty0                 0660   root       system
 /dev/graphics/*           0660   root       graphics
 /dev/msm_hw3dm            0660   system     graphics
-/dev/input/*              0660   root       input
+/dev/input/*              0640   system     input
 /dev/eac                  0660   root       audio
 /dev/cam                  0660   root       camera
 /dev/pmem                 0660   system     graphics

toolbox/getevent.c

diff --git a/toolbox/getevent.c b/toolbox/getevent.c
index e6def6b..1fb315c 100644
--- a/toolbox/getevent.c
+++ b/toolbox/getevent.c
@@ -321,7 +321,7 @@
     char idstr[80];
     struct input_id id;
 
-    fd = open(device, O_RDWR);
+    fd = open(device, O_RDONLY);
     if(fd < 0) {
         if(print_flags & PRINT_DEVICE_ERRORS)
             fprintf(stderr, "could not open %s, %s\n", device, strerror(errno));