aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2008-01-14 22:57:19 +0000
committerColin Percival <cperciva@FreeBSD.org>2008-01-14 22:57:19 +0000
commit22bd81bf62fb9d5b405889ebad805c2d462fa3d2 (patch)
tree82e9463ffb68f61960d0593b236f2570ae9ca2b1
parent0ace3a498843e57dbcd8b6bdf60930f84624dc4e (diff)
downloadsrc-22bd81bf62fb9d5b405889ebad805c2d462fa3d2.tar.gz
src-22bd81bf62fb9d5b405889ebad805c2d462fa3d2.zip
Fix issues which allow snooping on ptys.
Security: FreeBSD-SA-08:01.pty Approved by: so (cperciva)
Notes
Notes: svn path=/releng/5.5/; revision=175334
-rw-r--r--UPDATING3
-rw-r--r--lib/libutil/pty.c3
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 5 insertions, 3 deletions
diff --git a/UPDATING b/UPDATING
index daffe76d0ef9..4910fd6487b7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20080118: p18 FreeBSD-SA-08:01.pty
+ Fix issues which allow snooping on ptys.
+
20071129: p17 FreeBSD-SA-07:09.random, FreeBSD-SA-07:10.gtar
Correct a random value disclosure in random(4). [07:09]
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index b230edb113af..005a52fe38c7 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -76,8 +76,7 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct win
break; /* try the next pty group */
} else {
line[5] = 't';
- (void) chown(line, getuid(), ttygid);
- (void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP);
+ (void) grantpt(master);
(void) revoke(line);
if ((slave = open(line, O_RDWR, 0)) != -1) {
*amaster = master;
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index a41150fac5ed..3c3db8af5d5e 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="5.5"
-BRANCH="RELEASE-p17"
+BRANCH="RELEASE-p18"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"