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

Check for tp->t_refcnt == 0 before doing anything in tty_open().

Browse Source 
PR:		103520
MFC after:	1 week
This commit is contained in:
mbr 2006-09-23 14:52:46 +00:00
parent b8fd741213
commit 9af53fcaab
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/tty.c
View File

@ -3067,6 +3067,12 @@ ttyopen(struct cdev *dev, int flag, int mode, struct thread *td)
struct tty *tp;
tp = dev->si_tty;
/* XXX It can happen that devfs_open calls us with tp->t_refcnt == 0 */
if (tp == NULL || tp->t_refcnt == 0) {
return (ENXIO);
}
s = spltty();
/*
* We jump to this label after all non-interrupted sleeps to pick

12
sys/kern/tty_pty.c
View File

@ -196,6 +196,12 @@ ptsopen(struct cdev *dev, int flag, int devtype, struct thread *td)
return(ENXIO);
pt = dev->si_drv1;
tp = dev->si_tty;
/* XXX It can happen that devfs_open calls us with tp->t_refcnt == 0 */
if (tp == NULL || tp->t_refcnt == 0) {
return (ENXIO);
}
if ((tp->t_state & TS_ISOPEN) == 0) {
ttyinitmode(tp, 1, 0);
} else if (tp->t_state & TS_XCLUDE && suser(td))
@ -314,6 +320,12 @@ ptcopen(struct cdev *dev, int flag, int devtype, struct thread *td)
if (!dev->si_drv1)
return(ENXIO);
tp = dev->si_tty;
/* XXX It can happen that devfs_open calls us with tp->t_refcnt == 0 */
if (tp == NULL || tp->t_refcnt == 0) {
return (ENXIO);
}
if (tp->t_oproc)
return (EIO);
tp->t_timeout = -1;