imrcpan/freebsd
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-10-28 11:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

cuse: Use make_dev_s() to create client devices

Browse Source 
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
This commit is contained in:
Christos Margiolis committed 2026-09-30 11:50:03 +02:00
1 parent 34b00da59b
commit fad756fd20
1 file changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files
sys/fs/cuse/cuse.c
+13 -13
View File
@@ -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);