From nobody Wed Oct 07 06:24:39 2026 X-Original-To: dev-commits-src-branches@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 4j034m0RvGz6vMtj for ; Wed, 07 Oct 2026 06:24:40 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j034l4kcpz3NBK for ; Wed, 07 Oct 2026 06:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791354279; 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=MBh3waRNddjQOJTguLt3bYg2kdk/7uQ8vfwulGguPjg=; b=oQlOYBCEcyVz39IDhoh13xEDZuDNurP83KR6lCg1Gfv6fDRQBmCb2SuEOpWGHCQjKjj5JA +NaWmNHXg0Gjrqk1n0JtrYM9k5s5wgVUZGr9uTGiR12jaU8rvp+kL1B91LUxQdyNDNi1o6 KMQdCtS73oJ94TMsvxky1vzWvutmKeQriHpRXzLpxfCpFVt8nDLyDmdIBSu7rKqGQYPYjt Any63sPWKsU8/7CYifDBsbGr0VUxJcokhd+epVpUjbQIveIIGVTY1RRey+erlGMV55yA85 nTeQkzOP+SPPSwqg2syrIaO2ttm9HZF6/8hv/RU8fghdug1Hgmd3cWCU5Fq6MQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791354279; b=YS0zNqe3gbxUOf63NXwDuehnxIbXlA0J9hHibdvJ/TDup75BQqgZxNVktgigqdqi/9cW/x IBMlnRJ1hrqal9VmqsiHvHmMuOg4mjkYx+QFkXfT7/g1sBGF115BiPwNnXm8X7jnPxvXZY KHrBm2WB412it+DnJMMtPLvAuUjYapQB96heLQIN0AgAiSMqBoncw2KFaN6LVO1GVbT3sj H8NKU3LoBZySv2WQ1KIbLsR0M6pJ/CG4Q7AviOzISM7VYO1+0MhUcqXqHHUn95Kt3jq8t9 pfpmpikZJKX1XJgLgwSgioavQgzF26P6dPkNm0BySEN8nQFDpNI0yJR1sJsK9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791354279; 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=MBh3waRNddjQOJTguLt3bYg2kdk/7uQ8vfwulGguPjg=; b=c03s4M4Xb/auFGRPh8ZStR/UUoiMMUd+Y4WcZUwxhPosQ6AQeV0VVYW31uoOPoPojkJyf5 mDk47m20wPEvzAsl3RCBnCG516Gw3eR/OUrbTe1hO7POZAxhlkAkPMJAP7FCH2LXR2ZyXA tPA0awug4KSquZ1AHYkqaaCr+L19UGjRB4/ruLCCBh9CXNyMFUYQZQf8QNfoLAq7MC1b33 5IwMRYNznXcYsWlRFuXjS0Td9ikCMUpw7K7eFktUuneIlF8FHd5kvpq92YMgRXoO0E1p+6 W5zv/uxvmayLsZiVDAGClZCErnFSwapPVCs8Himh4LKS/eDYfhTnBHqiJ9fr2Q== 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 4j034l3qFzzhRH for ; Wed, 07 Oct 2026 06:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 408de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 06:24:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1c6b48130d9a - stable/15 - cuse: Use make_dev_s() to create client devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1c6b48130d9a7c7926ba04a91cdf9097fc6fd02d Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 06:24:39 +0000 Message-Id: <6ac5e5a7.408de.65a7a991@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1c6b48130d9a7c7926ba04a91cdf9097fc6fd02d commit 1c6b48130d9a7c7926ba04a91cdf9097fc6fd02d Author: Christos Margiolis AuthorDate: 2026-09-30 09:50:03 +0000 Commit: Christos Margiolis CommitDate: 2026-10-07 06:23:31 +0000 cuse: Use make_dev_s() to create client devices make_dev_s() sets si_drv1 before the node is published in devfs, which avoids a race where cuse_client_open() could see it as NULL. It also now reports finer-grained errors on failure, instead of only ENOMEM. While here, drop the NULL checks on kern_dev in cuse_server_free_dev(), since a device is only added to the server's list once it has been created. MFC after: 1 week Sponsored by: The FreeBSD Foundation Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D59874 (cherry picked from commit fad756fd200bf988861eb80146392661a887ab71) --- sys/fs/cuse/cuse.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index 52a1693a45ce..0bd8cc0d5dac 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -636,8 +636,7 @@ cuse_server_free_dev(struct cuse_server_dev *pcsd) /* prevent creation of more devices */ cuse_server_lock(pcs); - if (pcsd->kern_dev != NULL) - pcsd->kern_dev->si_drv1 = NULL; + pcsd->kern_dev->si_drv1 = NULL; TAILQ_FOREACH(pcc, &pcs->hcli, entry) { if (pcc->server_dev == pcsd) @@ -645,11 +644,8 @@ cuse_server_free_dev(struct cuse_server_dev *pcsd) } cuse_server_unlock(pcs); - /* destroy device, if any */ - if (pcsd->kern_dev != NULL) { - /* destroy device synchronously */ - destroy_dev(pcsd->kern_dev); - } + /* destroy device synchronously */ + destroy_dev(pcsd->kern_dev); free(pcsd, M_CUSE); } @@ -1078,6 +1074,7 @@ cuse_server_ioctl(struct cdev *dev, unsigned long cmd, struct cuse_create_dev *pcd; struct cuse_server_dev *pcsd; struct cuse_data_chunk *pchk; + struct make_dev_args args; int n; case CUSE_IOCTL_GET_COMMAND: @@ -1260,16 +1257,19 @@ cuse_server_ioctl(struct cdev *dev, unsigned long cmd, pcsd->user_dev = pcd->dev; - pcsd->kern_dev = make_dev_credf(MAKEDEV_CHECKNAME, - &cuse_client_devsw, 0, NULL, pcd->user_id, pcd->group_id, - pcd->permissions, "%s", pcd->devname); + make_dev_args_init(&args); + args.mda_flags = MAKEDEV_CHECKNAME; + args.mda_devsw = &cuse_client_devsw; + args.mda_uid = pcd->user_id; + args.mda_gid = pcd->group_id; + args.mda_mode = pcd->permissions; + args.mda_si_drv1 = pcsd; - if (pcsd->kern_dev == NULL) { + error = make_dev_s(&args, &pcsd->kern_dev, "%s", pcd->devname); + if (error != 0) { free(pcsd, M_CUSE); - error = ENOMEM; break; } - pcsd->kern_dev->si_drv1 = pcsd; cuse_server_lock(pcs); TAILQ_INSERT_TAIL(&pcs->hdev, pcsd, entry);