d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libjail: make allocation in jailparam_all() somewhat more robust.

Browse Source 
Unsign some variables involved in allocation as they will never be
negative anyways. Provide some bounds checking through reallocarray(3).

This is all very unlikely to have any visible effect.

Reviewed by:	jamie
MFC after:	3 weeks
This commit is contained in:
pfg 2017-04-16 19:23:10 +00:00
parent f3f1c24017
commit 309df784b1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libjail/jail.c
View File

@ -200,7 +200,7 @@ jailparam_all(struct jailparam **jpp)
{
struct jailparam *jp, *tjp;
size_t mlen1, mlen2, buflen;
int njp, nlist;
unsigned njp, nlist;
int mib1[CTL_MAXNAME], mib2[CTL_MAXNAME - 2];
char buf[MAXPATHLEN];
@ -250,7 +250,7 @@ jailparam_all(struct jailparam **jpp)
/* Add the parameter to the list */
if (njp >= nlist) {
nlist *= 2;
tjp = realloc(jp, nlist * sizeof(*jp));
tjp = reallocarray(jp, nlist, sizeof(*jp));
if (tjp == NULL)
goto error;
jp = tjp;
@ -259,7 +259,7 @@ jailparam_all(struct jailparam **jpp)
goto error;
mib1[1] = 2;
}
jp = realloc(jp, njp * sizeof(*jp));
jp = reallocarray(jp, njp, sizeof(*jp));
*jpp = jp;
return (njp);