diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2019-06-28 13:35:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-07-05 11:10:39 +1000 |
commit | 4d28fa78abce2890e136281950633fae2066cc29 (patch) | |
tree | 33226ec64ced661bb7e40005e30744b68fa59a80 /sshpty.c | |
parent | e8c974043c1648eab0ad67a7ba6a3e444fe79d2d (diff) |
upstream: When system calls indicate an error they return -1, not
some arbitrary value < 0. errno is only updated in this case. Change all
(most?) callers of syscalls to follow this better, and let's see if this
strictness helps us in the future.
OpenBSD-Commit-ID: 48081f00db7518e3b712a49dca06efc2a5428075
Diffstat (limited to 'sshpty.c')
-rw-r--r-- | sshpty.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshpty.c,v 1.31 2016/11/29 03:54:50 dtucker Exp $ */ | 1 | /* $OpenBSD: sshpty.c,v 1.32 2019/06/28 13:35:04 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -68,7 +68,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen) | |||
68 | int i; | 68 | int i; |
69 | 69 | ||
70 | i = openpty(ptyfd, ttyfd, NULL, NULL, NULL); | 70 | i = openpty(ptyfd, ttyfd, NULL, NULL, NULL); |
71 | if (i < 0) { | 71 | if (i == -1) { |
72 | error("openpty: %.100s", strerror(errno)); | 72 | error("openpty: %.100s", strerror(errno)); |
73 | return 0; | 73 | return 0; |
74 | } | 74 | } |
@@ -86,9 +86,9 @@ void | |||
86 | pty_release(const char *tty) | 86 | pty_release(const char *tty) |
87 | { | 87 | { |
88 | #if !defined(__APPLE_PRIVPTY__) && !defined(HAVE_OPENPTY) | 88 | #if !defined(__APPLE_PRIVPTY__) && !defined(HAVE_OPENPTY) |
89 | if (chown(tty, (uid_t) 0, (gid_t) 0) < 0) | 89 | if (chown(tty, (uid_t) 0, (gid_t) 0) == -1) |
90 | error("chown %.100s 0 0 failed: %.100s", tty, strerror(errno)); | 90 | error("chown %.100s 0 0 failed: %.100s", tty, strerror(errno)); |
91 | if (chmod(tty, (mode_t) 0666) < 0) | 91 | if (chmod(tty, (mode_t) 0666) == -1) |
92 | error("chmod %.100s 0666 failed: %.100s", tty, strerror(errno)); | 92 | error("chmod %.100s 0666 failed: %.100s", tty, strerror(errno)); |
93 | #endif /* !__APPLE_PRIVPTY__ && !HAVE_OPENPTY */ | 93 | #endif /* !__APPLE_PRIVPTY__ && !HAVE_OPENPTY */ |
94 | } | 94 | } |
@@ -108,7 +108,7 @@ pty_make_controlling_tty(int *ttyfd, const char *tty) | |||
108 | close(fd); | 108 | close(fd); |
109 | } | 109 | } |
110 | #endif /* TIOCNOTTY */ | 110 | #endif /* TIOCNOTTY */ |
111 | if (setsid() < 0) | 111 | if (setsid() == -1) |
112 | error("setsid: %.100s", strerror(errno)); | 112 | error("setsid: %.100s", strerror(errno)); |
113 | 113 | ||
114 | /* | 114 | /* |
@@ -131,14 +131,14 @@ pty_make_controlling_tty(int *ttyfd, const char *tty) | |||
131 | error("SETPGRP %s",strerror(errno)); | 131 | error("SETPGRP %s",strerror(errno)); |
132 | #endif /* NEED_SETPGRP */ | 132 | #endif /* NEED_SETPGRP */ |
133 | fd = open(tty, O_RDWR); | 133 | fd = open(tty, O_RDWR); |
134 | if (fd < 0) | 134 | if (fd == -1) |
135 | error("%.100s: %.100s", tty, strerror(errno)); | 135 | error("%.100s: %.100s", tty, strerror(errno)); |
136 | else | 136 | else |
137 | close(fd); | 137 | close(fd); |
138 | 138 | ||
139 | /* Verify that we now have a controlling tty. */ | 139 | /* Verify that we now have a controlling tty. */ |
140 | fd = open(_PATH_TTY, O_WRONLY); | 140 | fd = open(_PATH_TTY, O_WRONLY); |
141 | if (fd < 0) | 141 | if (fd == -1) |
142 | error("open /dev/tty failed - could not set controlling tty: %.100s", | 142 | error("open /dev/tty failed - could not set controlling tty: %.100s", |
143 | strerror(errno)); | 143 | strerror(errno)); |
144 | else | 144 | else |
@@ -188,7 +188,7 @@ pty_setowner(struct passwd *pw, const char *tty) | |||
188 | #endif | 188 | #endif |
189 | 189 | ||
190 | if (st.st_uid != pw->pw_uid || st.st_gid != gid) { | 190 | if (st.st_uid != pw->pw_uid || st.st_gid != gid) { |
191 | if (chown(tty, pw->pw_uid, gid) < 0) { | 191 | if (chown(tty, pw->pw_uid, gid) == -1) { |
192 | if (errno == EROFS && | 192 | if (errno == EROFS && |
193 | (st.st_uid == pw->pw_uid || st.st_uid == 0)) | 193 | (st.st_uid == pw->pw_uid || st.st_uid == 0)) |
194 | debug("chown(%.100s, %u, %u) failed: %.100s", | 194 | debug("chown(%.100s, %u, %u) failed: %.100s", |
@@ -202,7 +202,7 @@ pty_setowner(struct passwd *pw, const char *tty) | |||
202 | } | 202 | } |
203 | 203 | ||
204 | if ((st.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) != mode) { | 204 | if ((st.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)) != mode) { |
205 | if (chmod(tty, mode) < 0) { | 205 | if (chmod(tty, mode) == -1) { |
206 | if (errno == EROFS && | 206 | if (errno == EROFS && |
207 | (st.st_mode & (S_IRGRP | S_IROTH)) == 0) | 207 | (st.st_mode & (S_IRGRP | S_IROTH)) == 0) |
208 | debug("chmod(%.100s, 0%o) failed: %.100s", | 208 | debug("chmod(%.100s, 0%o) failed: %.100s", |