Skip to content

ENT-13550: Fixed buffer overflow in build XPath for edit_xml (3.24.x) #5997

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
larsewi merged 1 commit into from
Dec 19, 2025
+12 −7
Merged

ENT-13550: Fixed buffer overflow in build XPath for edit_xml (3.24.x) #5997

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
19 changes: 12 additions & 7 deletions cf-agent/files_editxml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#include <promises.h>
#include <files_names.h>
#include <files_edit.h>
#include <stddef.h>
#include <stdio.h>
#include <vars.h>
#include <item_lib.h>
#include <sort.h>
Expand All @@ -42,6 +44,7 @@
#include <ornaments.h>
#include <verify_classes.h>
#include <regex.h> /* StringMatch() */
#include <logging.h>

enum editxmltypesequence
{
Expand Down Expand Up @@ -344,20 +347,22 @@ static PromiseResult KeepEditXmlPromise(EvalContext *ctx, const Promise *pp,
static bool VerifyXPathBuild(EvalContext *ctx, const Attributes *attr, const Promise *pp, EditContext *edcontext, PromiseResult *result)
{
assert(attr != NULL);
assert(pp != NULL);
Attributes a = *attr; // TODO: Remove this copy
xmlDocPtr doc = NULL;
CfLock thislock;
char lockname[CF_BUFSIZE], rawxpath[CF_BUFSIZE] = { 0 };

a.transaction.ifelapsed = CF_EDIT_IFELAPSED;

if (a.xml.havebuildxpath)
{
strcpy(rawxpath, a.xml.build_xpath);
}
else
{
strcpy(rawxpath, pp->promiser);
int ret = snprintf(rawxpath, sizeof(rawxpath), "%s",
a.xml.havebuildxpath ? a.xml.build_xpath : pp->promiser);
if (ret < 0 ||(size_t)ret >= sizeof(rawxpath)) {
Log(LOG_LEVEL_VERBOSE, "Build XPath is too long (%d >= %zu)", ret, sizeof(rawxpath));
RecordFailure(ctx, pp, &a,
"The promised build XPath build is too long");
*result = PromiseResultUpdate(*result, PROMISE_RESULT_FAIL);
return false;
}

if (!SanityCheckXPathBuild(ctx, &a, pp, result))
Expand Down