Skip to content

Fix a couple of Coverity issues in health check plugin, around filenames #10371

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
zwoop merged 2 commits into from
Sep 5, 2023
Merged

Fix a couple of Coverity issues in health check plugin, around filenames #10371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
821abb4
Add a length check to healthcheck basename
zwoop Sep 4, 2023
b5afcc5
Fix the filename size
zwoop Sep 5, 2023
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: 8 additions & 3 deletions plugins/healthchecks/healthchecks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ typedef struct HCFileData_t {
typedef struct HCFileInfo_t {
char fname[MAX_PATH_LEN]; /* Filename */
char *basename; /* The "basename" of the file */
unsigned basename_len = 0; /* The length of the basename */
char path[PATH_NAME_MAX]; /* URL path for this HC */
int p_len; /* Length of path */
const char *ok; /* Header for an OK result */
Expand Down Expand Up @@ -137,6 +138,7 @@ setup_watchers(int fd)
conf->wd = inotify_add_watch(fd, conf->fname, IN_DELETE_SELF | IN_CLOSE_WRITE | IN_ATTRIB);
TSDebug(PLUGIN_NAME, "Setting up a watcher for %s", conf->fname);
strncpy(fname, conf->fname, MAX_PATH_LEN);

char *dname = dirname(fname);
/* Make sure to only watch each directory once */
if (!(dir = find_direntry(dname, head_dir))) {
Expand Down Expand Up @@ -216,7 +218,7 @@ hc_thread(void *data ATS_UNUSED)
HCFileInfo *finfo = g_config;

while (finfo && !((event->wd == finfo->wd) ||
((event->wd == finfo->dir->wd) && !strncmp(event->name, finfo->basename, event->len)))) {
((event->wd == finfo->dir->wd) && !strncmp(event->name, finfo->basename, finfo->basename_len)))) {
finfo = finfo->_next;
}
if (finfo) {
Expand Down Expand Up @@ -321,13 +323,16 @@ parse_configs(const char *fname)
++str;
}
strncpy(finfo->path, str, PATH_NAME_MAX - 1);
finfo->p_len = strlen(finfo->path);
finfo->path[PATH_NAME_MAX - 1] = '\0';
finfo->p_len = strlen(finfo->path);
break;
case 1:
strncpy(finfo->fname, str, MAX_PATH_LEN - 1);
finfo->basename = strrchr(finfo->fname, '/');
finfo->fname[MAX_PATH_LEN - 1] = '\0';
finfo->basename = strrchr(finfo->fname, '/');
if (finfo->basename) {
++(finfo->basename);
finfo->basename_len = strlen(finfo->basename);
}
break;
case 2:
Expand Down