Skip to content

SEC-1892: Fixed buffer overflow in the files promise #6028

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
larsewi wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −4
Open

SEC-1892: Fixed buffer overflow in the files promise #6028

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
43 changes: 39 additions & 4 deletions cf-agent/verify_files.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
#include <cf3.defs.h>
#include <fsattrs.h>
#include <override_fsattrs.h>
#include <logging.h>
#include <stddef.h>
#include <string.h>

static PromiseResult FindFilePromiserObjects(EvalContext *ctx, const Promise *pp);
static PromiseResult VerifyFilePromise(EvalContext *ctx, char *path, const Promise *pp);
Expand Down Expand Up @@ -1136,12 +1139,28 @@ PromiseResult ScheduleEditOperation(EvalContext *ctx, char *filename,
if ((vp = PromiseGetConstraintAsRval(pp, "edit_line", RVAL_TYPE_FNCALL)))
{
fp = (FnCall *) vp;
strcpy(edit_bundle_name, fp->name);
size_t ret = strlcpy(edit_bundle_name, fp->name, sizeof(edit_bundle_name));
if (ret >= sizeof(edit_bundle_name))
{
RecordFailure(ctx, pp, a,
"The edit_line bundle name is too long (%zu >= %zu)",
ret, sizeof(edit_bundle_name));
result = PromiseResultUpdate(result, PROMISE_RESULT_FAIL);
goto exit;
}
args = fp->args;
}
else if ((vp = PromiseGetConstraintAsRval(pp, "edit_line", RVAL_TYPE_SCALAR)))
{
strcpy(edit_bundle_name, (char *) vp);
size_t ret = strlcpy(edit_bundle_name, (char *) vp, sizeof(edit_bundle_name));
if (ret >= sizeof(edit_bundle_name))
{
RecordFailure(ctx, pp, a,
"The edit_line bundle name is too long (%zu >= %zu)",
ret, sizeof(edit_bundle_name));
result = PromiseResultUpdate(result, PROMISE_RESULT_FAIL);
goto exit;
}
args = NULL;
}
else
Expand Down Expand Up @@ -1174,12 +1193,28 @@ PromiseResult ScheduleEditOperation(EvalContext *ctx, char *filename,
if ((vp = PromiseGetConstraintAsRval(pp, "edit_xml", RVAL_TYPE_FNCALL)))
{
fp = (FnCall *) vp;
strcpy(edit_bundle_name, fp->name);
size_t ret = strlcpy(edit_bundle_name, fp->name, sizeof(edit_bundle_name));
if (ret >= sizeof(edit_bundle_name))
{
RecordFailure(ctx, pp, a,
"The edit_xml bundle name is too long (%zu >= %zu)",
ret, sizeof(edit_bundle_name));
result = PromiseResultUpdate(result, PROMISE_RESULT_FAIL);
goto exit;
}
args = fp->args;
}
else if ((vp = PromiseGetConstraintAsRval(pp, "edit_xml", RVAL_TYPE_SCALAR)))
{
strcpy(edit_bundle_name, (char *) vp);
size_t ret = strlcpy(edit_bundle_name, (char *) vp, sizeof(edit_bundle_name));
if (ret >= sizeof(edit_bundle_name))
{
RecordFailure(ctx, pp, a,
"The edit_xml bundle name is too long (%zu >= %zu)",
ret, sizeof(edit_bundle_name));
result = PromiseResultUpdate(result, PROMISE_RESULT_FAIL);
goto exit;
}
args = NULL;
}
else
Expand Down
Loading