mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-02 08:42:48 +00:00
Code Issues Releases Activity

- Close a race with concurrent open's of a pts master device which could

Browse Source 
result in leaked tty structures.
- When constructing a new pty, allocate it's tty structure before adding
  it to the list.

MFC after:	1 week
This commit is contained in:
John Baldwin 2008-08-04 19:49:05 +00:00
parent 8c0879b6f6
commit 0bc7bc0ec8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=181300
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/tty_pts.c
View File

@ -194,18 +194,16 @@ pty_new(void)
pt = LIST_FIRST(&pt_free_list);
if (pt) {
LIST_REMOVE(pt, pt_list);
LIST_INSERT_HEAD(&pt_list, pt, pt_list);
mtx_unlock(&pt_mtx);
} else {
nb = next_avail_nb++;
mtx_unlock(&pt_mtx);
pt = malloc(sizeof(*pt), M_PTY, M_WAITOK | M_ZERO);
pt->pt_tty = ttyalloc();
mtx_lock(&pt_mtx);
pt->pt_num = nb;
LIST_INSERT_HEAD(&pt_list, pt, pt_list);
mtx_unlock(&pt_mtx);
pt->pt_tty = ttyalloc();
}
LIST_INSERT_HEAD(&pt_list, pt, pt_list);
mtx_unlock(&pt_mtx);
return (pt);
}
@ -400,8 +398,16 @@ ptcopen(struct cdev *dev, int flag, int devtype, struct thread *td)
* we need to recreate it.
*/
if (pt->pt_tty == NULL) {
pt->pt_tty = ttyalloc();
dev->si_tty = pt->pt_tty;
tp = ttyalloc();
mtx_lock(&pt_mtx);
if (pt->pt_tty == NULL) {
pt->pt_tty = tp;
dev->si_tty = pt->pt_tty;
mtx_unlock(&pt_mtx);
} else {
mtx_unlock(&pt_mtx);
ttyrel(tp);
}
}
tp = dev->si_tty;
if (tp->t_oproc)