From nobody Mon Dec 1 20:43:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpT4v2pz6KKgq for ; Mon, 01 Dec 2025 20:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKwpT3d71z4Nk8 for ; Mon, 01 Dec 2025 20:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STTtjDminRatFUfqyL4PzXQgB6n1Z7si4gmrw7cxols=; b=ZV6w4efYVmaUpcEoU0+pOY2t/Xjii2Ixy3HKVEsdqhwhuCJ0IbK2XjyWjMufXbu+tK+1A7 uk2DQj3HaTzvo8DJS+/e3m9jCWWuo6n72OEIb/wvTCY5ZwQFsLKqiwA0TRDfwdHEmBist3 /JS9j8ixJOPCdFtBDgFk+Hkr0u9u3qogQGwhceMIZyBRzBU5lMa79Rl3JUfBEL7GCLNpsw EyewmLfEzqUts/IOSX1V8wFhWMbM1oqlgsrTlgHHz265fudmIEyyRQ4ymyTwlv6VJuq1ma rBtVgc/siDFu2uvSskeo1a0waJ5Ot0JsEcEx4k/tdz3Ah9Fl0vpvXp7881CcRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STTtjDminRatFUfqyL4PzXQgB6n1Z7si4gmrw7cxols=; b=iA0UCKZxrkjaH5xXDhYzupTWMdnu9a7Om5ZfljY0+tc5mA5/YILidSD10mKgMD9jGWQJAZ 7BJP//5ZMyB/jMrJjnqHLzSzzUSgiVA7slGq47LI0D4nMm39+6VTaB1YY+xESgGKojwepR HxPF4HSlyXZ4EwT/HU7XLZ+lx6p56LPcRlNoGjCULIE0VXDl7hgS5sQH5i1y9L3sfTxjz9 hxxSItcAo4nMHTGiYVrYXmnkEs/0m6cI61KxjjU6NFIbJ6vPQSZU5C75QG2TT0QVIpmAVs cHlKcHoytP6O62vXXwGQ8cyrfRre2lN9a0P8W9d4CpOUzkfPyMm/v4xBvmFrjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764621793; a=rsa-sha256; cv=none; b=USQVD4rjzIxhfBzMR1OR4+YGC+Dq2gTGV/zeoBzHlADyagyMzVIdbZxpV2Tm4j8xEUwJ6z LiCyQEoddmtZSG/Fc+VYJoOtrQtwMvlliTBo4BtJBOh/nrqMI9IuB8zefuUQR1UbB/dpd/ XK5L00LMRbZGat1xvfQgTeOhMwf/VZjGmwjyNpfUdANqfX0DW+84Rg6m5HRe7WCh37WeNI 28z/7F3YZYGeHMYMDDwdYWpPZfmrH4B4mESKAjN4LWGlijkW/1a/Vve/HMETIjbUZ2gBQj j4nTyfM+eKP5YpOW4ifPjCXpGjo67dtvhxNxUZ/IaF9KHQ74XPZD9JrOU7qKiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKwpT39SpzdG7 for ; Mon, 01 Dec 2025 20:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31887 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 20:43:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: b6cad334e649 - main - hid: Make game controllers accessible to members of the game group List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6cad334e649f49c57da52b139de353ad9078985 Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 20:43:13 +0000 Message-Id: <692dfde1.31887.556800c9@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b6cad334e649f49c57da52b139de353ad9078985 commit b6cad334e649f49c57da52b139de353ad9078985 Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:15 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-01 20:42:15 +0000 hid: Make game controllers accessible to members of the game group Their events have to be accessible by unprivileged users via e.g. libsdl. MFC after: 1 month --- share/man/man4/hgame.4 | 7 ++++--- share/man/man4/ps4dshock.4 | 5 ++++- share/man/man4/xb360gp.4 | 5 ++++- sys/dev/hid/hgame.c | 7 ++++++- sys/dev/hid/ps4dshock.c | 9 ++++++++- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/share/man/man4/hgame.4 b/share/man/man4/hgame.4 index 94ad4f5ff4a4..dd69d9ef3de1 100644 --- a/share/man/man4/hgame.4 +++ b/share/man/man4/hgame.4 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 12, 2025 +.Dd November 30, 2025 .Dt HGAME 4 .Os .Sh NAME @@ -69,8 +69,9 @@ prompt, or add it to To give user applications access to the game controllers, allow user access to the .Pa /dev/input/event* -nodes with -.Xr devfs.rules 5 . +nodes with inclusion of user in the +.Em games +group. .Sh HARDWARE The .Nm diff --git a/share/man/man4/ps4dshock.4 b/share/man/man4/ps4dshock.4 index 282a58c49e63..f48e2c07c1b7 100644 --- a/share/man/man4/ps4dshock.4 +++ b/share/man/man4/ps4dshock.4 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 19, 2020 +.Dd November 30, 2025 .Dt PS4DSHOCK 4 .Os .Sh NAME @@ -55,6 +55,9 @@ The device presents the game controller as a .Ar evdev type device. +It is accessible to members of the +.Em games +group. .Sh SYSCTL VARIABLES Next parameters are available as .Xr sysctl 8 diff --git a/share/man/man4/xb360gp.4 b/share/man/man4/xb360gp.4 index 4e8d4b65fcfd..1ff42e970858 100644 --- a/share/man/man4/xb360gp.4 +++ b/share/man/man4/xb360gp.4 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 16, 2020 +.Dd November 30, 2025 .Dt XB360GP 4 .Os .Sh NAME @@ -56,6 +56,9 @@ The device presents the game controller as a .Ar evdev type device. +It is accessible to members of the +.Em games +group. .Sh SYSCTL VARIABLES The following variable is available as both .Xr sysctl 8 diff --git a/sys/dev/hid/hgame.c b/sys/dev/hid/hgame.c index b074f6145d0e..8dde6b5550c9 100644 --- a/sys/dev/hid/hgame.c +++ b/sys/dev/hid/hgame.c @@ -33,8 +33,10 @@ #include #include +#include #include #include +#include #include #include @@ -170,8 +172,11 @@ hgame_final_cb(HIDMAP_CB_ARGS) { struct evdev_dev *evdev = HIDMAP_CB_GET_EVDEV(); - if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) + if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_prop(evdev, INPUT_PROP_DIRECT); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS); diff --git a/sys/dev/hid/ps4dshock.c b/sys/dev/hid/ps4dshock.c index d3c6b3eeadf9..1cd9cb13bad3 100644 --- a/sys/dev/hid/ps4dshock.c +++ b/sys/dev/hid/ps4dshock.c @@ -37,10 +37,12 @@ #include #include +#include #include #include #include #include +#include #include #include @@ -806,8 +808,11 @@ ps4dshock_final_cb(HIDMAP_CB_ARGS) { struct evdev_dev *evdev = HIDMAP_CB_GET_EVDEV(); - if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) + if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_prop(evdev, INPUT_PROP_DIRECT); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS); @@ -886,6 +891,8 @@ ps4dsacc_final_cb(HIDMAP_CB_ARGS) if (HIDMAP_CB_GET_STATE() == HIDMAP_CB_IS_ATTACHING) { evdev_support_event(evdev, EV_ABS); evdev_support_prop(evdev, INPUT_PROP_ACCELEROMETER); + evdev_set_cdev_mode(evdev, UID_ROOT, GID_GAMES, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); } /* Do not execute callback at interrupt handler and detach */ return (ENOSYS);