summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2010-04-08 08:58:18 +0000
committerkib <kib@FreeBSD.org>2010-04-08 08:58:18 +0000
commit231b3cddc22a5b26c4ad32e9ea03d9bd95f62923 (patch)
treec140fb89e618f1373713777f2a687c55b1879ef7 /sys/kern
parent3e6076f696e3705fd7336b6ed13398bc8566f873 (diff)
downloadFreeBSD-src-231b3cddc22a5b26c4ad32e9ea03d9bd95f62923.zip
FreeBSD-src-231b3cddc22a5b26c4ad32e9ea03d9bd95f62923.tar.gz
Do not leak master pty or ptmx vnode.
Report and test case by: Petr Salinger <Petr.Salinger seznam cz> Reviewed by: ed MFC after: 1 week
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/tty_pts.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c
index 5cfbc71..51f2641 100644
--- a/sys/kern/tty_pts.c
+++ b/sys/kern/tty_pts.c
@@ -575,6 +575,15 @@ ptsdev_close(struct file *fp, struct thread *td)
tty_lock(tp);
tty_rel_gone(tp);
+ /*
+ * Open of /dev/ptmx or /dev/ptyXX changes the type of file
+ * from DTYPE_VNODE to DTYPE_PTS. vn_open() increases vnode
+ * use count, we need to decrement it, and possibly do other
+ * required cleanup.
+ */
+ if (fp->f_vnode != NULL)
+ return (vnops.fo_close(fp, td));
+
return (0);
}
OpenPOWER on IntegriCloud