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

Properly check against errors against fwrite

Browse Source 
fwrite is not the same as write; you have to explicitly compare against the length to detect errors, and sometimes number of items is mistaken for length.
This commit is contained in:
Rose 2025-06-17 13:44:54 -04:00 committed by Todd C. Miller
parent e6cf241b03
commit 5fad16bda2
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/iolog/iolog_write.c
View File

@ -84,7 +84,7 @@ iolog_write(struct iolog_file *iol, const void *buf, size_t len,
#endif #endif
{ {
ret = (ssize_t)fwrite(buf, 1, len, iol->fd.f); ret = (ssize_t)fwrite(buf, 1, len, iol->fd.f);
if (ret <= 0) { if (ret != (ssize_t)len) {
ret = -1; ret = -1;
if (errstr != NULL) if (errstr != NULL)
*errstr = strerror(errno); *errstr = strerror(errno);

2
plugins/python/regress/iohelpers.c
View File

@ -51,7 +51,7 @@ fwriteall(const char *file_path, const char *string)
goto cleanup; goto cleanup;
size_t size = strlen(string); size_t size = strlen(string);
if (fwrite(string, 1, size, file) < size) { if (fwrite(string, 1, size, file) != size) {
goto cleanup; goto cleanup;
} }

4
plugins/sudoers/sudo_printf.c
View File

@ -68,8 +68,8 @@ sudo_printf_int(int msg_type, const char * restrict fmt, ...)
len = vasprintf(&buf, fmt, ap); len = vasprintf(&buf, fmt, ap);
va_end(ap); va_end(ap);
} }
if (len != -1) { if (len >= 0) {
if (fwrite(buf, 1, (size_t)len, ttyfp ? ttyfp : fp) == 0) if (fwrite(buf, 1, (size_t)len, ttyfp ? ttyfp : fp) != (size_t)len)
len = -1; len = -1;
if (buf != sbuf) if (buf != sbuf)
free(buf); free(buf);

8
src/conversation.c
View File

@ -120,9 +120,9 @@ sudo_conversation(int num_msgs, const struct sudo_conv_message msgs[],
close(ttyfd); close(ttyfd);
} }
if (!written) { if (!written) {
if (len != 0 && fwrite(msg->msg, 1, len, fp) == 0) if (len != 0 && fwrite(msg->msg, 1, len, fp) != len)
goto err; goto err;
if (crnl != NULL && fwrite(crnl, 1, 2, fp) == 0) if (crnl != NULL && fwrite(crnl, 1, 2, fp) != 2)
goto err; goto err;
} }
} }
@ -218,8 +218,8 @@ sudo_conversation_printf(int msg_type, const char * restrict fmt, ...)
len = vasprintf(&buf, fmt, ap); len = vasprintf(&buf, fmt, ap);
va_end(ap); va_end(ap);
} }
if (len != -1) { if (len >= 0) {
if (fwrite(buf, 1, (size_t)len, ttyfp ? ttyfp : fp) == 0) if (fwrite(buf, 1, (size_t)len, ttyfp ? ttyfp : fp) != (size_t)len)
len = -1; len = -1;
if (buf != sbuf) if (buf != sbuf)
free(buf); free(buf);