d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hold dev_lock and check for NULL devsw pointer when we service FIODTYPE ioctl.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2004-09-24 06:16:48 +00:00
parent 70526ca6a5
commit 6e8d420249
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/vfs_vnops.c
View File

@ -806,12 +806,20 @@ vn_ioctl(fp, com, data, active_cred, td)
case VCHR:
case VBLK:
if (com == FIODTYPE) {
if (vp->v_rdev == NULL)
return (EOPNOTSUPP);
dev_lock();
if (vp->v_type != VCHR && vp->v_type != VBLK)
return (ENOTTY);
*(int *)data = devsw(vp->v_rdev)->d_flags & D_TYPEMASK;
return (0);
error = ENOTTY;
else if (vp->v_rdev == NULL)
error = ENXIO;
else if (vp->v_rdev->si_devsw == NULL)
error = ENXIO;
else {
error = 0;
*(int *)data =
vp->v_rdev->si_devsw->d_flags & D_TYPEMASK;
}
dev_unlock();
return (error);
}
error = VOP_IOCTL(vp, com, data, fp->f_flag, active_cred, td);
if (error == ENOIOCTL) {