Skip to content

librc: prevent false daemon matches across files #1051

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

Open
pva wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −7
Open

librc: prevent false daemon matches across files #1051

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
23 changes: 16 additions & 7 deletions src/librc/librc-daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,16 @@ rc_find_pids(const char *exec, const char *const *argv, uid_t uid, pid_t pid)
#endif

static bool
_match_daemon(const char *svcname, const char *instance, RC_STRINGLIST *match)
_match_daemon(const char *svcname, const char *instance,
const RC_STRINGLIST *match)
{
char *line = NULL;
size_t len = 0;
FILE *fp;
RC_STRING *m;
RC_STRINGLIST *match_copy;
char *daemon;
bool retval;

xasprintf(&daemon, "%s/%s", svcname, instance);
fp = do_fopenat(rc_dirfd(RC_DIR_DAEMONS), daemon, O_RDONLY);
Expand All @@ -331,20 +334,26 @@ _match_daemon(const char *svcname, const char *instance, RC_STRINGLIST *match)
if (!fp)
return false;

match_copy = rc_stringlist_new();
TAILQ_FOREACH(m, match, entries)
rc_stringlist_add(match_copy, m->value);

while (xgetline(&line, &len, fp) != -1) {
TAILQ_FOREACH(m, match, entries)
TAILQ_FOREACH(m, match_copy, entries)
if (strcmp(line, m->value) == 0) {
TAILQ_REMOVE(match, m, entries);
TAILQ_REMOVE(match_copy, m, entries);
free(m->value);
free(m);
break;
}
if (!TAILQ_FIRST(match))
if (!TAILQ_FIRST(match_copy))
break;
}
fclose(fp);
free(line);
if (TAILQ_FIRST(match))
return false;
return true;
retval = !TAILQ_FIRST(match_copy);
rc_stringlist_free(match_copy);
return retval;
}

static RC_STRINGLIST *
Expand Down
Loading