Skip to content

ENT-13551: Fixed potential buffer overflow when converting strings to GIDs/UIDs #5990

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 15, 2025
+16 −18
Merged

ENT-13551: Fixed potential buffer overflow when converting strings to GIDs/UIDs #5990

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions cf-agent/cf-agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1766,7 +1766,7 @@ static void CheckAgentAccess(const Rlist *list, const Policy *policy)

for (const Rlist *rp = list; rp != NULL; rp = rp->next)
{
if (Str2Uid(RlistScalarValue(rp), NULL, NULL) == uid)
if (Str2Uid(RlistScalarValue(rp), NULL, 0, NULL) == uid)
{
return;
}
Expand All @@ -1786,7 +1786,7 @@ static void CheckAgentAccess(const Rlist *list, const Policy *policy)
bool access = false;
for (const Rlist *rp2 = ACCESSLIST; rp2 != NULL; rp2 = rp2->next)
{
if (Str2Uid(RlistScalarValue(rp2), NULL, NULL) == sb.st_uid)
if (Str2Uid(RlistScalarValue(rp2), NULL, 0, NULL) == sb.st_uid)
{
access = true;
break;
Expand Down
12 changes: 6 additions & 6 deletions libpromises/conversion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ UidList *Rlist2UidList(Rlist *uidnames, const Promise *pp)
for (rp = uidnames; rp != NULL; rp = rp->next)
{
username[0] = '\0';
uid = Str2Uid(RlistScalarValue(rp), username, pp);
uid = Str2Uid(RlistScalarValue(rp), username, sizeof(username), pp);
AddSimpleUidItem(&uidlist, uid, username);
}

Expand Down Expand Up @@ -1049,7 +1049,7 @@ GidList *Rlist2GidList(Rlist *gidnames, const Promise *pp)
for (rp = gidnames; rp != NULL; rp = rp->next)
{
groupname[0] = '\0';
gid = Str2Gid(RlistScalarValue(rp), groupname, pp);
gid = Str2Gid(RlistScalarValue(rp), groupname, sizeof(groupname), pp);
AddSimpleGidItem(&gidlist, gid, groupname);
}

Expand All @@ -1063,7 +1063,7 @@ GidList *Rlist2GidList(Rlist *gidnames, const Promise *pp)

/*********************************************************************/

uid_t Str2Uid(const char *uidbuff, char *usercopy, const Promise *pp)
uid_t Str2Uid(const char *uidbuff, char *usercopy, size_t copy_size, const Promise *pp)
{
if (StringEqual(uidbuff, "*"))
{
Expand Down Expand Up @@ -1126,7 +1126,7 @@ uid_t Str2Uid(const char *uidbuff, char *usercopy, const Promise *pp)
{
if (usercopy != NULL)
{
strcpy(usercopy, uidbuff);
strlcpy(usercopy, uidbuff, copy_size);
}
}
else
Expand All @@ -1142,7 +1142,7 @@ uid_t Str2Uid(const char *uidbuff, char *usercopy, const Promise *pp)

/*********************************************************************/

gid_t Str2Gid(const char *gidbuff, char *groupcopy, const Promise *pp)
gid_t Str2Gid(const char *gidbuff, char *groupcopy, size_t copy_size, const Promise *pp)
{
if (StringEqual(gidbuff, "*"))
{
Expand All @@ -1169,7 +1169,7 @@ gid_t Str2Gid(const char *gidbuff, char *groupcopy, const Promise *pp)
{
if (groupcopy != NULL)
{
strcpy(groupcopy, gidbuff);
strlcpy(groupcopy, gidbuff, copy_size);
}
}
else
Expand Down
4 changes: 2 additions & 2 deletions libpromises/conversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ void GidListDestroy(GidList *gids);
UidList *Rlist2UidList(Rlist *uidnames, const Promise *pp);
GidList *Rlist2GidList(Rlist *gidnames, const Promise *pp);
#ifndef __MINGW32__
uid_t Str2Uid(const char *uidbuff, char *copy, const Promise *pp);
gid_t Str2Gid(const char *gidbuff, char *copy, const Promise *pp);
uid_t Str2Uid(const char *uidbuff, char *copy, size_t copy_size, const Promise *pp);
gid_t Str2Gid(const char *gidbuff, char *copy, size_t copy_size, const Promise *pp);
#endif /* !__MINGW32__ */

#endif
8 changes: 4 additions & 4 deletions libpromises/evalfunction.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,7 @@ static FnCallResult FnCallGetUserInfo(ARG_UNUSED EvalContext *ctx, ARG_UNUSED co
char *arg = RlistScalarValue(finalargs);
if (StringIsNumeric(arg))
{
uid_t uid = Str2Uid(arg, NULL, NULL);
uid_t uid = Str2Uid(arg, NULL, 0, NULL);
if (uid == CF_SAME_OWNER) // user "*"
{
uid = getuid();
Expand Down Expand Up @@ -1592,7 +1592,7 @@ static FnCallResult FnCallGetGroupInfo(ARG_UNUSED EvalContext *ctx, ARG_UNUSED c
char *arg = RlistScalarValue(finalargs);
if (StringIsNumeric(arg))
{
gid_t gid = Str2Gid(arg, NULL, NULL);
gid_t gid = Str2Gid(arg, NULL, 0, NULL);
if (gid == CF_SAME_GROUP) // user "*"
{
gid = getgid();
Expand Down Expand Up @@ -9261,7 +9261,7 @@ FnCallResult FnCallUserExists(ARG_UNUSED EvalContext *ctx, ARG_UNUSED const Poli

if (StringIsNumeric(arg))
{
uid_t uid = Str2Uid(arg, NULL, NULL);
uid_t uid = Str2Uid(arg, NULL, 0, NULL);
if (uid == CF_SAME_OWNER || uid == CF_UNKNOWN_OWNER)
{
return FnFailure();
Expand All @@ -9288,7 +9288,7 @@ FnCallResult FnCallGroupExists(ARG_UNUSED EvalContext *ctx, ARG_UNUSED const Pol

if (StringIsNumeric(arg))
{
gid_t gid = Str2Gid(arg, NULL, NULL);
gid_t gid = Str2Gid(arg, NULL, 0, NULL);
if (gid == CF_SAME_GROUP || gid == CF_UNKNOWN_GROUP)
{
return FnFailure();
Expand Down
6 changes: 2 additions & 4 deletions libpromises/policy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2964,7 +2964,6 @@ uid_t PromiseGetConstraintAsUid(const EvalContext *ctx, const char *lval, const
uid_t PromiseGetConstraintAsUid(const EvalContext *ctx, const char *lval, const Promise *pp)
{
int retval = CF_SAME_OWNER;
char buffer[CF_MAXVARSIZE];

const Constraint *cp = PromiseGetConstraint(pp, lval);
if (cp)
Expand All @@ -2978,7 +2977,7 @@ uid_t PromiseGetConstraintAsUid(const EvalContext *ctx, const char *lval, const
FatalError(ctx, "Aborted");
}

retval = Str2Uid((char *) cp->rval.item, buffer, pp);
retval = Str2Uid((char *) cp->rval.item, NULL, 0, pp);
}

return retval;
Expand Down Expand Up @@ -3006,7 +3005,6 @@ gid_t PromiseGetConstraintAsGid(const EvalContext *ctx, char *lval, const Promis
gid_t PromiseGetConstraintAsGid(const EvalContext *ctx, char *lval, const Promise *pp)
{
int retval = CF_SAME_GROUP;
char buffer[CF_MAXVARSIZE];

const Constraint *cp = PromiseGetConstraint(pp, lval);
if (cp)
Expand All @@ -3020,7 +3018,7 @@ gid_t PromiseGetConstraintAsGid(const EvalContext *ctx, char *lval, const Promis
FatalError(ctx, "Aborted");
}

retval = Str2Gid((char *) cp->rval.item, buffer, pp);
retval = Str2Gid((char *) cp->rval.item, NULL, 0, pp);
}

return retval;
Expand Down
Loading