From nobody Mon Dec 1 20:43:12 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 4dKwpS3tw3z6KKjw for ; Mon, 01 Dec 2025 20:43:12 +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 4dKwpS32Hwz4NTP for ; Mon, 01 Dec 2025 20:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621792; 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=70NEw8ydnGSJBbOzjFmBMfpOXiTDLYwLhl86+J44WOw=; b=BRvUeUAhgBBSTVumMYV2z2Dy6urlIz3sPw2WQeoNGGlaE1QfcSQKbyxK2J1de8SZh5Dl4C TlIQRRKGZSGosAtMC2gE2MyhzgrMq/ZCtnESYENYTl4SGSaYbbqWuC7KCOhMLVEG3xLeFc RwV8se8Al8bRqFEVa5oU4lnfJ3xGgHPGkFvP4ONNrKTbikmoQbbi9Kr9jyzx+OrfH8NXtD YQWCaGbok0do2scSDaX2CnwcZFiaOe84tMcfNqNezoo8cJzN78MEn5b+KUaa7UL3vUeEnV FEUmdjZ1tNJg+4/asHX7uQ5wL9l4aoLw9Yevn1vc/VxaIcV9pd9bX8ofyXIarg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764621792; 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=70NEw8ydnGSJBbOzjFmBMfpOXiTDLYwLhl86+J44WOw=; b=b6ghFjbITbbhSVJX7vkwYlF9TU6SNipPQnFmn3CY8UK3GUhOttKURbO21q3FnrFkva+yGD +cJmPat0MPpoMZQJvrzphtZPSFqIgme/z2JJ/cwsi0dmhFm51mKa2mtYTW0b1ROl9EuToz eDPuBhLTDgFGSqLqBKBgOO88CVJQ0mJ4XE7+K6SE+LwTV3+3Aav9bde9Fu9uGUruYP40rq Vz1hGgxO+F7lIwzfhsrJmP+EWanGhq5Cys2eFJU2oa0/ncvxEJzInaiM+QbCMnaID5Ailm /pel4aDlml24EuSfPUjZchp8Qnr3Tv8hVK046Hhn6ARfda7Pt7KnjoIK0328cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764621792; a=rsa-sha256; cv=none; b=Et//mu8jEdSemqm1CqjmvJ3Pq/rkyRs+UAU0C69E1IpzK0flMqBgVgrFuqdwoxOy4D4njp GmGSizMZ5/JTNksr6eeNf23ak2phf2TjX59m8a4SZomPO9Z/jJxpwpob4jKpLTlTmBaF7Z ij/0PBi9nZ0txtn6QhF4sk5owcC+/ggidbYlCGWRdZeXURN4xKajMnCKbrUhwegbKsm5Cz 4DSourak8LQPUynNqyulNHJXgpPC0ZiYywkdftW2tRIx66xpsbxkWipfbcdOl7TAT0Abcf GfKZ0ajXNOFnlvfF6LDques3momr9yaEUVVBIbLzqLKqPl44vrBM6NmyWFAt+Q== 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 4dKwpS2d2tzcyg for ; Mon, 01 Dec 2025 20:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31de4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 20:43:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: ecccc9d99901 - main - evdev: Allow setting of character device ownership and access mode 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: ecccc9d99901dd874e8d122853026d7c28fa4fcf Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 20:43:12 +0000 Message-Id: <692dfde0.31de4.4c5251df@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=ecccc9d99901dd874e8d122853026d7c28fa4fcf commit ecccc9d99901dd874e8d122853026d7c28fa4fcf Author: Vladimir Kondratyev AuthorDate: 2025-12-01 20:42:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-12-01 20:42:14 +0000 evdev: Allow setting of character device ownership and access mode by device driver. That is required as game pad and joystick events have to be accessible by ordinary users. MFC after: 1 month --- sys/dev/evdev/cdev.c | 6 +++--- sys/dev/evdev/evdev.c | 17 ++++++++++++++++- sys/dev/evdev/evdev.h | 1 + sys/dev/evdev/evdev_private.h | 3 +++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/dev/evdev/cdev.c b/sys/dev/evdev/cdev.c index dd4115cdfc71..2f47056081d2 100644 --- a/sys/dev/evdev/cdev.c +++ b/sys/dev/evdev/cdev.c @@ -772,9 +772,9 @@ evdev_cdev_create(struct evdev_dev *evdev) make_dev_args_init(&mda); mda.mda_flags = MAKEDEV_WAITOK | MAKEDEV_CHECKNAME; mda.mda_devsw = &evdev_cdevsw; - mda.mda_uid = UID_ROOT; - mda.mda_gid = GID_WHEEL; - mda.mda_mode = 0600; + mda.mda_uid = evdev->ev_cdev_uid; + mda.mda_gid = evdev->ev_cdev_gid; + mda.mda_mode = evdev->ev_cdev_mode; mda.mda_si_drv1 = evdev; /* Try to coexist with cuse-backed input/event devices */ diff --git a/sys/dev/evdev/evdev.c b/sys/dev/evdev/evdev.c index e71f4f389d5c..4dcd6f23d338 100644 --- a/sys/dev/evdev/evdev.c +++ b/sys/dev/evdev/evdev.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -94,8 +95,14 @@ static int evdev_check_event(struct evdev_dev *, uint16_t, uint16_t, int32_t); struct evdev_dev * evdev_alloc(void) { + struct evdev_dev *evdev; - return malloc(sizeof(struct evdev_dev), M_EVDEV, M_WAITOK | M_ZERO); + evdev = malloc(sizeof(struct evdev_dev), M_EVDEV, M_WAITOK | M_ZERO); + evdev->ev_cdev_uid = UID_ROOT; + evdev->ev_cdev_gid = GID_WHEEL; + evdev->ev_cdev_mode = S_IRUSR | S_IWUSR; + + return (evdev); } void @@ -584,6 +591,14 @@ evdev_set_flag(struct evdev_dev *evdev, uint16_t flag) bit_set(evdev->ev_flags, flag); } +void +evdev_set_cdev_mode(struct evdev_dev *evdev, uid_t uid, gid_t gid, int mode) +{ + evdev->ev_cdev_uid = uid; + evdev->ev_cdev_gid = gid; + evdev->ev_cdev_mode = mode; +} + static int evdev_check_event(struct evdev_dev *evdev, uint16_t type, uint16_t code, int32_t value) diff --git a/sys/dev/evdev/evdev.h b/sys/dev/evdev/evdev.h index 2ee374f184cc..d5aa58f0ccc4 100644 --- a/sys/dev/evdev/evdev.h +++ b/sys/dev/evdev/evdev.h @@ -153,6 +153,7 @@ void evdev_support_sw(struct evdev_dev *, uint16_t); void evdev_set_repeat_params(struct evdev_dev *, uint16_t, int); int evdev_set_report_size(struct evdev_dev *, size_t); void evdev_set_flag(struct evdev_dev *, uint16_t); +void evdev_set_cdev_mode(struct evdev_dev *, uid_t, gid_t, int); void *evdev_get_softc(struct evdev_dev *); bool evdev_is_grabbed(struct evdev_dev *); diff --git a/sys/dev/evdev/evdev_private.h b/sys/dev/evdev/evdev_private.h index 661259bd2594..4c371e538598 100644 --- a/sys/dev/evdev/evdev_private.h +++ b/sys/dev/evdev/evdev_private.h @@ -111,6 +111,9 @@ struct evdev_dev char ev_shortname[NAMELEN]; char ev_serial[NAMELEN]; struct cdev * ev_cdev; + uid_t ev_cdev_uid; + gid_t ev_cdev_gid; + int ev_cdev_mode; int ev_unit; enum evdev_lock_type ev_lock_type; struct mtx * ev_state_lock; /* State lock */