From 9ec7fa5fdae099ff8a11e24cf40ee603403991e1 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 21 Jun 2026 21:07:50 +0000 Subject: Fix hardening of string reading from nsssd-switch --- src/libnsss/nsss_switch_grp_read.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libnsss/nsss_switch_grp_read.c') diff --git a/src/libnsss/nsss_switch_grp_read.c b/src/libnsss/nsss_switch_grp_read.c index 47577f0..2fb34bc 100644 --- a/src/libnsss/nsss_switch_grp_read.c +++ b/src/libnsss/nsss_switch_grp_read.c @@ -43,13 +43,13 @@ int nsss_switch_grp_read (buffer *b, struct group *gr, stralloc *sa, genalloc *g p = sa->s + sa->len ; len = total ; q = genalloc_s(char *, ga) + genalloc_len(char *, ga) ; grtmp.gr_mem = q ; - grtmp.gr_name = p ; x = strnlen(p, len) + 1 ; p += x ; len -= x ; + grtmp.gr_name = p ; x = strnlen(p, len-1) + 1 ; p += x ; len -= x ; if (!len) return (errno = EPROTO, 0) ; - grtmp.gr_passwd = p ; x = strnlen(p, len) + 1 ; p += x ; len -= x ; + grtmp.gr_passwd = p ; x = strnlen(p, len-1) + 1 ; p += x ; len -= x ; for (uint32_t i = 0 ; i < n ; i++) { if (!len) return (errno = EPROTO, 0) ; - q[i] = p ; x = strnlen(p, len) + 1 ; p += x ; len -= x ; + q[i] = p ; x = strnlen(p, len-1) + 1 ; p += x ; len -= x ; } if (len) return (errno = EPROTO, 0) ; q[n] = 0 ; -- cgit v1.3.1