46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From 5f78618a44a21197e727cd1c62da5aa8bf7e0610 Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Fri, 31 Dec 2021 00:31:51 +0900
|
|
Subject: [PATCH] nss-systemd: fix required buffer size calculation
|
|
|
|
This also fixes the pointer assigned to the gr_mem element of struct group.
|
|
|
|
Fixes a bug introduced by 47fd7fa6c650d7a0ac41bc89747e3b866ffb9534.
|
|
|
|
Fixes #21935.
|
|
|
|
(cherry picked from commit 1e65eb8f9b7d567462030b2e625998d77677e636)
|
|
(cherry picked from commit 17227e81ab8a9bdfac679d450ed35434435a6ff8)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd/commit/5f78618a44a21197e727cd1c62da5aa8bf7e0610
|
|
---
|
|
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 1840a0d508..7aea3652c4 100644
|
|
--- a/src/nss-systemd/nss-systemd.c
|
|
+++ b/src/nss-systemd/nss-systemd.c
|
|
@@ -236,7 +236,7 @@ static enum nss_status copy_synthesized_group(
|
|
|
|
required = strlen(src->gr_name) + 1;
|
|
required += strlen(src->gr_passwd) + 1;
|
|
- required += 1; /* ...but that NULL still needs to be stored into the buffer! */
|
|
+ required += sizeof(char*); /* ...but that NULL still needs to be stored into the buffer! */
|
|
|
|
if (buflen < required) {
|
|
*errnop = ERANGE;
|
|
@@ -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 **) strcpy(dest->gr_passwd, src->gr_passwd) + 1;
|
|
+ dest->gr_mem = (char **) stpcpy(dest->gr_passwd, src->gr_passwd) + 1;
|
|
*dest->gr_mem = NULL;
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
--
|
|
2.33.0
|
|
|