From 649e83bb995eb067cce3e70f50e5d3ab54c9d47d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 31 Dec 2021 06:59:42 +0900 Subject: [PATCH] nss-systemd: fix alignment of gr_mem Follow-up for 1e65eb8f9b7d567462030b2e625998d77677e636. Fixes #21935. (cherry picked from commit 420a35c1fadfb4d67be6316436233d98b5688de5) (cherry picked from commit 9c8bc0451ab2393f3b9b689e46e1b05e9f6dad35) Conflict:NA Reference:https://github.com/systemd/systemd/commit/649e83bb995eb067cce3e70f50e5d3ab54c9d47d --- src/nss-systemd/nss-systemd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c index 7aea3652c4..36486b96e3 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; -- 2.33.0