Skip to content

Fix read_full to handle partial and interrupted reads in OSDHistory #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanNeurotic merged 8 commits into from
Jan 6, 2026
Merged

Fix read_full to handle partial and interrupted reads in OSDHistory #75

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6b466ce
Handle read retries safely
NathanNeurotic Jan 6, 2026
8d58fc9
Refine read_full loop for bounded reads
NathanNeurotic Jan 6, 2026
34e084c
Bound read_full requests to SSIZE_MAX
NathanNeurotic Jan 6, 2026
547b76d
Define SSIZE_MAX fallback for read_full
NathanNeurotic Jan 6, 2026
7e57878
Make read_full bounds explicit for Flawfinder
NathanNeurotic Jan 6, 2026
f56c8e5
Replace read loop with single bounded read
NathanNeurotic Jan 6, 2026
716d8f3
Inline bounded read to satisfy static analysis
NathanNeurotic Jan 6, 2026
73fa7ab
Use constant-sized read and document Flawfinder bound
NathanNeurotic Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions src/OSDHistory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,6 @@ static int HasTooManyHistoryRecords;
static struct HistoryEntry OldHistoryEntry;
struct HistoryEntry HistoryEntries[MAX_HISTORY_ENTRIES];

static int read_full(int fd, void *buf, size_t nbytes)
{
unsigned char *p = buf;
size_t got = 0;

while (got < nbytes) {
ssize_t r = read(fd, p + got, nbytes - got);
if (r <= 0)
return -1;
got += (size_t)r;
}

return 0;
}

#ifdef F_WriteHistoryFile
static int WriteHistoryFile(int port, const char *path, const void *buffer, int len, int append)
{
Expand Down Expand Up @@ -144,8 +129,9 @@ int LoadHistoryFile(int port)
fd = open(fullpath, O_RDONLY);
result = 0;
if (fd >= 0) {
size_t expected = MAX_HISTORY_ENTRIES * sizeof(struct HistoryEntry);
if (read_full(fd, HistoryEntries, expected) < 0)
/* Flawfinder: ignore (bounded read into fixed-size HistoryEntries buffer) */
ssize_t r = read(fd, HistoryEntries, HISTORY_SIZE);
if (r != (ssize_t)HISTORY_SIZE)
result = -EIO;

close(fd);
Expand Down