From patchwork Fri Mar 20 20:42:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 132123 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id E629A4C515F9 for ; Fri, 20 Mar 2026 20:56:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E629A4C515F9 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=jBdZtP91 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id F26AD4C31829 for ; Fri, 20 Mar 2026 20:42:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F26AD4C31829 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F26AD4C31829 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774039372; cv=none; b=BUE6E9CVaPUThaR5lRz0aCYJ4kA542a5GigSrj6aNDT+h7Qv2d69i2UOeETu/mhv8XzbHmRlGrbwuO/wYDjUCnBPL56vVSi6Xx5Xz7i5qQTkP5IAFXKutNLxJ8Hu7oVhx6N5SYqQ74UfhseXRqltaaE1jVIle2cKv0v1ejxTpLo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774039372; c=relaxed/simple; bh=iEyHHITNzFTURvLTTv2sUOLBLrh/1yW5RawHML1+XlY=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=P/a5Anm96frMei+Af7Cgglv2sADGajmJxWNU3bVsRaYmy4//aWW5pHjQDAMp0sO/Td1yWeyMTvjcIotvthMzLCIytrwWkNCRJs1Mu6gpzIO395c1k/jgbBmN0cgZt+V4VGa18UHjx18Ri5MUyOGXwRN3Y0uzJqqrlSKgXqEIinE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F26AD4C31829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774039371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/ixXoNMyCYjxRaAIpcDzY60CI1lyQHSfuC12ZQX5v9M=; b=jBdZtP91q4iBzcVBmYuW3hd3FnTIUQCdsXNVgO+zbueRxGDzCg8IsctnT0GHuSiQNMlSPy z24wAFFxhpRxzznjor3rduSfnbyVvy9bnH8nNObkye/fSwIZAQ/Mc162b3bYyYCMgmOroQ WKDbYJ5+G090Kv4GZtrcdvXc+UwY0cg= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-tghvaDmrPK2Hxz0-ksJxew-1; Fri, 20 Mar 2026 16:42:50 -0400 X-MC-Unique: tghvaDmrPK2Hxz0-ksJxew-1 X-Mimecast-MFC-AGG-ID: tghvaDmrPK2Hxz0-ksJxew_1774039369 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3EB721956055 for ; Fri, 20 Mar 2026 20:42:49 +0000 (UTC) Received: from fweimer-oldenburg.csb.redhat.com (unknown [10.45.224.63]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 849391955F21 for ; Fri, 20 Mar 2026 20:42:48 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v2 16/23] nscd: Convert group client to __nscd_generic_get In-Reply-To: Message-ID: <0d040554d5c810bd6aa53720b1678f564a061d1e.1774037705.git.fweimer@redhat.com> References: X-From-Line: 0d040554d5c810bd6aa53720b1678f564a061d1e Mon Sep 17 00:00:00 2001 Date: Fri, 20 Mar 2026 21:42:46 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: cbNqPftaaGj0KHV4tg3QjYIw5ho6jjokL8fuwXynTQg_1774039369 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, PROLO_LEO1, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org --- nscd/nscd_getgr_r.c | 250 ++++---------------------------------------- 1 file changed, 19 insertions(+), 231 deletions(-) Reviewed-by: Carlos O'Donell diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c index f77650b25f..daf046bcbf 100644 --- a/nscd/nscd_getgr_r.c +++ b/nscd/nscd_getgr_r.c @@ -31,21 +31,21 @@ #include #include <_itoa.h> #include +#include #include "nscd-client.h" #include "nscd-dbtype.h" #include "nscd_proto.h" -static int nscd_getgr_r (const char *key, size_t keylen, request_type type, - struct group *resultbuf, char *buffer, - size_t buflen, struct group **result); - +static int nscd_getgr_r (enum nss_lookup_type lt, const void *key, + struct group *resultbuf, char *buffer, size_t buflen, + struct group **result); int __nscd_getgrnam_r (const char *name, struct group *resultbuf, char *buffer, size_t buflen, struct group **result) { - return nscd_getgr_r (name, strlen (name) + 1, GETGRBYNAME, resultbuf, + return nscd_getgr_r (nss_lookup_getgrnam, name, resultbuf, buffer, buflen, result); } @@ -54,241 +54,29 @@ int __nscd_getgrgid_r (gid_t gid, struct group *resultbuf, char *buffer, size_t buflen, struct group **result) { - char buf[3 * sizeof (gid_t)]; - buf[sizeof (buf) - 1] = '\0'; - char *cp = _itoa_word (gid, buf + sizeof (buf) - 1, 10, 0); - - return nscd_getgr_r (cp, buf + sizeof (buf) - cp, GETGRBYGID, resultbuf, + return nscd_getgr_r (nss_lookup_getgrgid, &gid, resultbuf, buffer, buflen, result); } static int -nscd_getgr_r (const char *key, size_t keylen, request_type type, +nscd_getgr_r (enum nss_lookup_type lt, const void *key, struct group *resultbuf, char *buffer, size_t buflen, struct group **result) { - int gc_cycle; - int nretries = 0; - const uint32_t *len = NULL; - struct scratch_buffer lenbuf; - scratch_buffer_init (&lenbuf); - - /* If the mapping is available, try to search there instead of - communicating with the nscd. */ - struct mapped_database *map = __nscd_get_map_ref (grpdb, &gc_cycle); - retry:; - const char *gr_name = NULL; - size_t gr_name_len = 0; - int retval = -1; - const char *recend = (const char *) ~UINTMAX_C (0); - gr_response_header gr_resp; - - if (map != NULL) + void *result1; + bool ok = __nscd_generic_get (lt, key, &result1); + if (ok) { - struct datahead *found = __nscd_cache_search (type, key, keylen, map, - sizeof gr_resp); - if (found != NULL) - { - len = (const uint32_t *) (&found->data[0].grdata + 1); - gr_resp = found->data[0].grdata; - gr_name = ((const char *) len - + gr_resp.gr_mem_cnt * sizeof (uint32_t)); - gr_name_len = gr_resp.gr_name_len + gr_resp.gr_passwd_len; - recend = (const char *) found->data + found->recsize; - /* Now check if we can trust gr_resp fields. If GC is - in progress, it can contain anything. */ - if (map->head->gc_cycle != gc_cycle) - { - retval = -2; - goto out; - } - - /* The alignment is always sufficient, unless GC is in progress. */ - assert (((uintptr_t) len & (__alignof__ (*len) - 1)) == 0); - } - } - - int sock = -1; - if (gr_name == NULL) - { - sock = __nscd_open_socket (key, keylen, type, &gr_resp, - sizeof (gr_resp)); - if (sock == -1) - { - __nscd_defer_database (grpdb); - goto out; - } - } - - /* No value found so far. */ - *result = NULL; - - if (__glibc_unlikely (gr_resp.found == -1)) - { - /* The daemon does not cache this database. */ - __nscd_defer_database (grpdb); - goto out_close; - } - - if (gr_resp.found == 1) - { - struct iovec vec[2]; - char *p = buffer; - size_t total_len; - uintptr_t align; - nscd_ssize_t cnt; - - /* Now allocate the buffer the array for the group members. We must - align the pointer. */ - align = ((__alignof__ (char *) - ((uintptr_t) p)) - & (__alignof__ (char *) - 1)); - total_len = (align + (1 + gr_resp.gr_mem_cnt) * sizeof (char *) - + gr_resp.gr_name_len + gr_resp.gr_passwd_len); - if (__glibc_unlikely (buflen < total_len)) - { - no_room: - __set_errno (ERANGE); - retval = ERANGE; - goto out_close; - } - buflen -= total_len; - - p += align; - resultbuf->gr_mem = (char **) p; - p += (1 + gr_resp.gr_mem_cnt) * sizeof (char *); - - /* Set pointers for strings. */ - resultbuf->gr_name = p; - p += gr_resp.gr_name_len; - resultbuf->gr_passwd = p; - p += gr_resp.gr_passwd_len; - - /* Fill in what we know now. */ - resultbuf->gr_gid = gr_resp.gr_gid; - - /* Read the length information, group name, and password. */ - if (gr_name == NULL) - { - /* Handle a simple, usual case: no group members. */ - if (__glibc_likely (gr_resp.gr_mem_cnt == 0)) - { - size_t n = gr_resp.gr_name_len + gr_resp.gr_passwd_len; - if (__builtin_expect (__readall (sock, resultbuf->gr_name, n) - != (ssize_t) n, 0)) - goto out_close; - } - else - { - /* Allocate array to store lengths. */ - if (!scratch_buffer_set_array_size - (&lenbuf, gr_resp.gr_mem_cnt, sizeof (uint32_t))) - goto out_close; - len = lenbuf.data; - - vec[0].iov_base = (void *) len; - vec[0].iov_len = gr_resp.gr_mem_cnt * sizeof (uint32_t); - vec[1].iov_base = resultbuf->gr_name; - vec[1].iov_len = gr_resp.gr_name_len + gr_resp.gr_passwd_len; - total_len = vec[0].iov_len + vec[1].iov_len; - - /* Get this data. */ - size_t n = __readvall (sock, vec, 2); - if (__glibc_unlikely (n != total_len)) - goto out_close; - } - } - else - /* We already have the data. Just copy the group name and - password. */ - memcpy (resultbuf->gr_name, gr_name, - gr_resp.gr_name_len + gr_resp.gr_passwd_len); - - /* Clear the terminating entry. */ - resultbuf->gr_mem[gr_resp.gr_mem_cnt] = NULL; - - /* Prepare reading the group members. */ - total_len = 0; - for (cnt = 0; cnt < gr_resp.gr_mem_cnt; ++cnt) + if (result1 == NULL) { - resultbuf->gr_mem[cnt] = p; - total_len += len[cnt]; - p += len[cnt]; + *result = NULL; + return 0; } - - if (__glibc_unlikely (gr_name + gr_name_len + total_len > recend)) - { - /* len array might contain garbage during nscd GC cycle, - retry rather than fail in that case. */ - if (gr_name != NULL && map->head->gc_cycle != gc_cycle) - retval = -2; - goto out_close; - } - if (__glibc_unlikely (total_len > buflen)) - { - /* len array might contain garbage during nscd GC cycle, - retry rather than fail in that case. */ - if (gr_name != NULL && map->head->gc_cycle != gc_cycle) - { - retval = -2; - goto out_close; - } - else - goto no_room; - } - - retval = 0; - - /* If there are no group members TOTAL_LEN is zero. */ - if (gr_name == NULL) - { - if (total_len > 0 - && __builtin_expect (__readall (sock, resultbuf->gr_mem[0], - total_len) != total_len, 0)) - { - /* The `errno' to some value != ERANGE. */ - __set_errno (ENOENT); - retval = ENOENT; - } - else - *result = resultbuf; - } - else - { - /* Copy the group member names. */ - memcpy (resultbuf->gr_mem[0], gr_name + gr_name_len, total_len); - - /* Try to detect corrupt databases. */ - if (resultbuf->gr_name[gr_name_len - 1] != '\0' - || resultbuf->gr_passwd[gr_resp.gr_passwd_len - 1] != '\0' - || ({for (cnt = 0; cnt < gr_resp.gr_mem_cnt; ++cnt) - if (resultbuf->gr_mem[cnt][len[cnt] - 1] != '\0') - break; - cnt < gr_resp.gr_mem_cnt; })) - { - /* We cannot use the database. */ - retval = map != NULL && map->head->gc_cycle != gc_cycle ? -2 : -1; - goto out_close; - } - - *result = resultbuf; - } - } - else - { - /* Set errno to 0 to indicate no error, just no found record. */ - __set_errno (0); - /* Even though we have not found anything, the result is zero. */ - retval = 0; + int ret = __nss_generic_copy (lt, result1, resultbuf, buffer, buflen); + free (result1); + if (ret == 0) + *result = resultbuf; + return ret; } - - out_close: - if (sock != -1) - __close_nocancel_nostatus (sock); - out: - if (__nscd_map_ref_retry_or_drop (&map, &gc_cycle, &nretries, retval)) - goto retry; - - scratch_buffer_free (&lenbuf); - - return retval; + return -1; }