git: 4a2340ccd44f - main - pkg-serve: fix stack leak on read() error
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Nov 2026 15:18:56 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=4a2340ccd44f8fb3edac8f63e6b0a8e657a2fd64
commit 4a2340ccd44f8fb3edac8f63e6b0a8e657a2fd64
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2026-11-17 15:17:52 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2026-11-17 15:18:42 +0000
pkg-serve: fix stack leak on read() error
read() returns ssize_t; stored in a size_t, an error became SIZE_MAX,
so the r <= 0 test missed it and fwrite() sent SIZE_MAX bytes from the
stack buffer to the client. Use ssize_t and cast for fwrite().
Reported by: llm-postcr
---
libexec/pkg-serve/pkg-serve.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libexec/pkg-serve/pkg-serve.c b/libexec/pkg-serve/pkg-serve.c
index b087f9971c3f..5fda81d689e7 100644
--- a/libexec/pkg-serve/pkg-serve.c
+++ b/libexec/pkg-serve/pkg-serve.c
@@ -68,8 +68,8 @@ main(int argc, char *argv[])
cap_rights_t rights, ffdrights;
char line[MAXLINE];
char *file, *age;
- size_t r, toread;
- ssize_t linelen;
+ size_t toread;
+ ssize_t r, linelen;
off_t remaining;
time_t mtime;
char *end;
@@ -204,7 +204,7 @@ main(int argc, char *argv[])
r = read(ffd, buf, toread);
if (r <= 0)
break;
- if (fwrite(buf, 1, r, stdout) != r)
+ if (fwrite(buf, 1, (size_t)r, stdout) != (size_t)r)
break;
remaining -= r;
}