From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 30 Dec 2021 21:59:42 +0000 (+0900)
Subject: nss-systemd: fix alignment of gr_mem
X-Git-Tag: v251-rc1~614^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=420a35c1fadfb4d67be6316436233d98b5688de5;p=thirdparty%2Fsystemd.git

nss-systemd: fix alignment of gr_mem

Follow-up for 1e65eb8f9b7d567462030b2e625998d77677e636.

Fixes #21935.
---

diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index 7aea3652c41..36486b96e39 100644
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -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;