summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/x11-common
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-04-03 12:49:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-04 14:00:32 +0100
commit150b7ac8e1c0f029b90f63424867ee5347821cf7 (patch)
tree8218a6c0af46708eaa51ea46af4946e6db1ab90b /meta/recipes-graphics/x11-common
parent66c9b46f987f3e4f1f9b7b11d1ae157897454f07 (diff)
downloadopenembedded-core-150b7ac8e1c0f029b90f63424867ee5347821cf7.tar.gz
openembedded-core-150b7ac8e1c0f029b90f63424867ee5347821cf7.tar.bz2
openembedded-core-150b7ac8e1c0f029b90f63424867ee5347821cf7.zip
xserver-nodm-init: Add xuser to input group
Fixes [YOCTO 4164](3/3) Input devices come and go, so a single chmod in this init script is not adequate to ensure rootless X servers can use input devices. The o+rw method also introduces a security hole. The newly added input group and input udev rule address this in a secure way. Ensure the xuser is added to the input group. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Saul Wold <sgw@linux.intel.com> Cc: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/x11-common')
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init.bb4
-rwxr-xr-xmeta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm1
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index eab76c597b..d2797a99d1 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
-PR = "r30"
+PR = "r31"
RDEPENDS_${PN} = "sudo"
SRC_URI = "file://xserver-nodm \
@@ -34,6 +34,6 @@ INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
# USERADD_PARAM is in sync with the one in connman.inc
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--create-home \
- --groups video,tty,audio \
+ --groups video,tty,audio,input \
--user-group xuser"
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index e790fb0921..f6692a814b 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
@@ -33,7 +33,6 @@ case "$1" in
# setting for rootless X
chmod o+w /var/log
chmod g+r /dev/tty[0-3]
- chmod o+rw /dev/input/*
# hidraw device is probably needed
if [ -e /dev/hidraw0 ]; then
chmod o+rw /dev/hidraw*