isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When copying gr_mem we must guarantee that the storage space for

Browse Source 
gr_mem is properly aligned.  The simplest way to do this is to
simply store gr_mem directly after struct group.  This is not a
problem for gr_passwd or gr_name as they are simple strings.
This commit is contained in:
Todd C. Miller
2008-01-18 22:32:52 +00:00
parent 09c1189d1b
commit 2a5a01c22d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pwutil.c
View File

@@ -458,12 +458,11 @@ sudo_grdup(gr)
/* /*
* Copy in group contents and make strings relative to space * Copy in group contents and make strings relative to space
* at the end of the buffer. * at the end of the buffer. Note that gr_mem must come
* immediately after struct group to guarantee proper alignment.
*/ */
(void)memcpy(newgr, gr, sizeof(struct group)); (void)memcpy(newgr, gr, sizeof(struct group));
cp += sizeof(struct group); cp += sizeof(struct group);
FIELD_COPY(gr, newgr, gr_name, nsize);
FIELD_COPY(gr, newgr, gr_passwd, psize);
if (gr->gr_mem) { if (gr->gr_mem) {
newgr->gr_mem = (char **)cp; newgr->gr_mem = (char **)cp;
cp += sizeof(char *) * nmem; cp += sizeof(char *) * nmem;
@@ -475,6 +474,8 @@ sudo_grdup(gr)
} }
newgr->gr_mem[nmem] = NULL; newgr->gr_mem[nmem] = NULL;
} }
FIELD_COPY(gr, newgr, gr_passwd, psize);
FIELD_COPY(gr, newgr, gr_name, nsize);
return(newgr); return(newgr);
} }