mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-05 08:45:28 +00:00
Code Issues Releases Wiki Activity

Check for negative return value of read, write and lseek instead of -1

Browse Source 
The return values are used in ways that assume they are positive.
In practice, it is not possible to have a negative return value
other than -1 due to the size of the buffers being read from or
written to.  Also add overflow checks when updating the buffer len.
Quiets several coverity warnings.
This commit is contained in:
Todd C. Miller
2025-01-14 14:07:52 -07:00
parent 6df96785ff
commit a27b989c9c
22 changed files with 172 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/sudoers/log_client.c
View File

@@ -1791,21 +1791,24 @@ server_msg_cb(int fd, int what, void *v)
} else
#endif /* HAVE_OPENSSL */
{
nread = (size_t)read(fd, buf->data + buf->len, buf->size - buf->len);
const ssize_t n = read(fd, buf->data + buf->len, buf->size - buf->len);
if (n < 0) {
if (errno == EAGAIN)
debug_return;
sudo_warn("read");
goto bad;
}
nread = (size_t)n;
}
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: received %zd bytes from server",
__func__, nread);
switch (nread) {
case (size_t)-1:
if (errno == EAGAIN)
debug_return;
sudo_warn("read");
goto bad;
case 0:
if (nread == 0) {
sudo_warnx("%s", U_("lost connection to log server"));
goto bad;
default:
break;
}
if (nread > SIZE_MAX - buf->len) {
sudo_warnx(U_("internal error, %s overflow"), __func__);
goto bad;
}
buf->len += nread;
@@ -1928,11 +1931,15 @@ client_msg_cb(int fd, int what, void *v)
} else
#endif /* HAVE_OPENSSL */
{
nwritten = (size_t)write(fd, buf->data + buf->off, buf->len - buf->off);
const ssize_t n = write(fd, buf->data + buf->off, buf->len - buf->off);
if (n < 0) {
sudo_warn("send");
goto bad;
}
nwritten = (size_t)n;
}
if (nwritten == (size_t)-1) {
sudo_warn("send");
if (nwritten > SIZE_MAX - buf->off) {
sudo_warnx(U_("internal error, %s overflow"), __func__);
goto bad;
}
buf->off += nwritten;