diff options
| author | Michal Zidek <mzidek@redhat.com> | 2013-09-10 23:09:04 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-12-10 12:04:50 +0100 |
| commit | 8bf65dbab8703697c85b033beb5c189fce17b036 (patch) | |
| tree | eb99c28b6e004fc6c05ede4a7cdc30569cce7dbf /src/sss_client/nss_group.c | |
| parent | 65f4003b93157b32eb0dcd6955d37dd009dc960e (diff) | |
| download | sssd-8bf65dbab8703697c85b033beb5c189fce17b036.tar.gz sssd-8bf65dbab8703697c85b033beb5c189fce17b036.tar.xz sssd-8bf65dbab8703697c85b033beb5c189fce17b036.zip | |
Properly align buffer when storing pointers.
Properly align buffer address to sizeof(char *) when storing
pointers to strings.
resolves:
https://fedorahosted.org/sssd/ticket/1359
Diffstat (limited to 'src/sss_client/nss_group.c')
| -rw-r--r-- | src/sss_client/nss_group.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/sss_client/nss_group.c b/src/sss_client/nss_group.c index a7fb09375..9e259318d 100644 --- a/src/sss_client/nss_group.c +++ b/src/sss_client/nss_group.c @@ -233,14 +233,12 @@ static int sss_nss_getgr_readrep(struct sss_nss_gr_rep *pr, NULL); if (ret != EOK) return ret; - /* Make sure pr->buffer[i+pad] is 32 bit aligned */ - pad = 0; - while((i + pad) % 4) { - pad++; - } + /* Make sure pr->buffer[i+pad] is aligned to sizeof(char *) */ + pad = PADDING_SIZE(i, char *); /* now members */ pr->result->gr_mem = (char **)&(pr->buffer[i+pad]); + ptmem = (sizeof(char *) * (mem_num + 1)) + pad; if (ptmem > dlen) { return ERANGE; /* not ENOMEM, ERANGE is what glibc looks for */ |