diff options
author | 2015-10-20 20:21:18 +0000 | |
---|---|---|
committer | 2015-10-20 20:21:18 +0000 | |
commit | 619dd0015dad2a1951802049ae8d48efdf5a1b6f (patch) | |
tree | 71a1858a4b74a4f0c9b96b255c1dd13e9037b70b /usr.bin/write/write.c | |
parent | believe this will work with "stdio rpath wpath cpath inet" now that (diff) | |
download | wireguard-openbsd-619dd0015dad2a1951802049ae8d48efdf5a1b6f.tar.xz wireguard-openbsd-619dd0015dad2a1951802049ae8d48efdf5a1b6f.zip |
Fix write to other user's tty. The device has to be opened with
O_WRONLY, but without O_CREAT. So freopen(3) has to be replaced
with open(2) and dup2(2).
from deraadt@
Diffstat (limited to 'usr.bin/write/write.c')
-rw-r--r-- | usr.bin/write/write.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c index ffbe8a8681f..aae63a63c25 100644 --- a/usr.bin/write/write.c +++ b/usr.bin/write/write.c @@ -1,4 +1,4 @@ -/* $OpenBSD: write.c,v 1.31 2015/10/09 01:37:09 deraadt Exp $ */ +/* $OpenBSD: write.c,v 1.32 2015/10/20 20:21:18 bluhm Exp $ */ /* $NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $ */ /* @@ -228,6 +228,7 @@ do_write(char *tty, char *mytty, uid_t myuid) time_t now; char path[PATH_MAX], host[HOST_NAME_MAX+1], line[512]; gid_t gid; + int fd; /* Determine our login name before the we reopen() stdout */ if ((login = getlogin()) == NULL) { @@ -238,8 +239,14 @@ do_write(char *tty, char *mytty, uid_t myuid) } (void)snprintf(path, sizeof(path), "%s%s", _PATH_DEV, tty); - if ((freopen(path, "r+", stdout)) == NULL) - err(1, "%s", path); + fd = open(path, O_WRONLY, 0666); + if (fd == -1) + err(1, "open %s", path); + fflush(stdout); + if (dup2(fd, STDOUT_FILENO) == -1) + err(1, "dup2 %s", path); + if (fd != STDOUT_FILENO) + close(fd); /* revoke privs, now that we have opened the tty */ gid = getgid(); |