Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drvctl(4): Take the kernel lock around entry into autoconf(9). 

Can make this finer-grained once the rest of autoconf(9) is in good
enough shape to support it.
This commit is contained in:
riastradh 2021-06-12 12:11:59 +00:00
parent 5a0c6b14f9
commit 61e759e504
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/kern/kern_drvctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_drvctl.c,v 1.45 2020/06/11 02:28:01 thorpej Exp $ */
/* $NetBSD: kern_drvctl.c,v 1.46 2021/06/12 12:11:59 riastradh Exp $ */
/*
* Copyright (c) 2004
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.45 2020/06/11 02:28:01 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.46 2021/06/12 12:11:59 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -336,6 +336,7 @@ drvctl_ioctl(struct file *fp, u_long cmd, void *data)
int *locs;
size_t locs_sz = 0; /* XXXgcc */
KERNEL_LOCK(1, NULL);
switch (cmd) {
case DRVSUSPENDDEV:
case DRVRESUMEDEV:
@ -363,14 +364,16 @@ drvctl_ioctl(struct file *fp, u_long cmd, void *data)
ifattr = 0;
if (d->numlocators) {
if (d->numlocators > MAXLOCATORS)
return EINVAL;
if (d->numlocators > MAXLOCATORS) {
res = EINVAL;
goto out;
}
locs_sz = d->numlocators * sizeof(int);
locs = kmem_alloc(locs_sz, KM_SLEEP);
res = copyin(d->locators, locs, locs_sz);
if (res) {
kmem_free(locs, locs_sz);
return res;
goto out;
}
} else
locs = NULL;
@ -388,8 +391,10 @@ drvctl_ioctl(struct file *fp, u_long cmd, void *data)
fp->f_flag);
break;
default:
return EPASSTHROUGH;
res = EPASSTHROUGH;
break;
}
out: KERNEL_UNLOCK_ONE(NULL);
return res;
}