Skip to content

system_stats: fix buffer overflow caught by asan #9723

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
traeak merged 1 commit into from
May 22, 2023
Merged

system_stats: fix buffer overflow caught by asan #9723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions plugins/experimental/system_stats/system_stats.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,17 @@ statAdd(const char *name, TSRecordDataType record_type, TSMutex create_mutex)
return stat_id;
}

static int
getFile(const char *filename, char *buffer, int bufferSize)
static ssize_t
getFile(const char *filename, char *buffer, size_t bufferSize)
{
TSFile f = 0;
size_t s = 0;

f = TSfopen(filename, "r");
TSFile f = TSfopen(filename, "r");
if (!f) {
buffer[0] = 0;
// Return -1 to indicate read err
return -1;
}

s = TSfread(f, buffer, bufferSize);
ssize_t s = TSfread(f, buffer, bufferSize - 1);
if (s > 0) {
buffer[s] = 0;
} else {
Expand Down