nss-systemd: fix alignment of gr_mem

Follow-up for 1e65eb8f9b.

Fixes #21935.
This commit is contained in:
Yu Watanabe
2021-12-31 09:05:16 +09:00
parent af73d8bd83
commit 420a35c1fa
+2 -2
View File
@@ -238,7 +238,7 @@ static enum nss_status copy_synthesized_group(
required += strlen(src->gr_passwd) + 1;
required += sizeof(char*); /* ...but that NULL still needs to be stored into the buffer! */
if (buflen < required) {
if (buflen < ALIGN(required)) {
*errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}
@@ -250,7 +250,7 @@ static enum nss_status copy_synthesized_group(
/* String fields point into the user-provided buffer */
dest->gr_name = buffer;
dest->gr_passwd = stpcpy(dest->gr_name, src->gr_name) + 1;
dest->gr_mem = (char **) stpcpy(dest->gr_passwd, src->gr_passwd) + 1;
dest->gr_mem = ALIGN_PTR(stpcpy(dest->gr_passwd, src->gr_passwd) + 1);
*dest->gr_mem = NULL;
return NSS_STATUS_SUCCESS;