From nobody Mon Jan 20 22:42:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YcQM500Nnz5l3w5; Mon, 20 Jan 2025 22:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YcQM46V99z4QD3; Mon, 20 Jan 2025 22:42:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737412928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4EVGgSfJrXYEJjWMBdevhoKKYo9z9tCdNwBn2Qxboo=; b=xFioA5yFXI7dbWDUsRCJjUms/3VbZi8NDkYamKodjP0PpfPrAsO2tnINuIPA9ksVc9E5y0 K4CaWfuWFy6en4rAXcT6/2UL0ZIgDeNlRhGdyZVUUNtPXeJ4KjpnQWsjyRvHXFX/5U8Xx/ usj6IgH4Qqh/tGF/U6rXGAfP7wlvGKkHzojRTlH/yuczmWvjc3vlSkc2C/iXl/ptOiWGJH ctBy48L1GpjzZt7/2XMQ0b01UIZ2J1UwKG7qAICQ4dLEi33K/orscmIAeRzstvQHF4TXG6 HI7k+oVGuO7kJccMnwNGJQoBn5EU43eK7syHIP8VSuhgn5moFppcFdkUUUEbkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737412928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4EVGgSfJrXYEJjWMBdevhoKKYo9z9tCdNwBn2Qxboo=; b=MbZy3DvbHD7A5U48jwvvuXYxlJI1YmHC0El8o5baHAHSPwLtFmPJI7h3MX3mqOGj3lfCKK onnJkB0NdIvfbmNvPoIN93wMwWDAJFDxTvs67HGzvvMYoR5ZVbJA2gTS26hvFKMntk9Pdm C7xnwe3mN2e29RNNazXzNwSFwUCgQjTmUlOnmMcbYpxxZg6S8jskUYsfv03RQsx/mlaF+s FKbwD5F8lx4KsoVwWtEQT2A5iJsKQ9raHxjFL9jBhsPmzUVZwLa2iC4f1K0UnOpTUtwjv0 FZ4qJ6XzHZ0kqE6zJ6hpc/ewnY/DXW4F0MVcmq4014cjmWTf+bHX4j18rF6Pnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737412928; a=rsa-sha256; cv=none; b=n/D0Oc1pU96/a5obweksQsGJldLX2TlS0ixST1jarWVYtZLRVmgtVXHOIgfWCt6NwoqB9f dAZnZkDMmOvniwVY1ZQP85oY/M9hU/9i5wz3yDNZ9Slvmpk8iKkjTIjF/8IL9cnV0m1fGb qGfZvFylZuCfIu/IO2MKsRUfD7PMrQga7rqD0OKc7/hQ1Qdu3bWRwOHET3M98vV/elVzfP TX6P6Ba/sfDn98zvSNP6Fu8vvYuXPcWbnEQdDqiUOY5c3YvYg5ZWOhVW3NGGiYmajvr26z km4AZrAK217Zg4GIjtoFDbDsmEI17S/thA/OpSA0RKcTkm4NRmc5UwdmOuqkPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YcQM463bhzgXV; Mon, 20 Jan 2025 22:42:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50KMg8TZ022069; Mon, 20 Jan 2025 22:42:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KMg8lX022066; Mon, 20 Jan 2025 22:42:08 GMT (envelope-from git) Date: Mon, 20 Jan 2025 22:42:08 GMT Message-Id: <202501202242.50KMg8lX022066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1486bb0bfcac - stable/13 - Fix lib/libc/nss/getgr_test with large numbers of groups List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1486bb0bfcacafe5dd1c2f3add7b92e57f7e1ff2 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1486bb0bfcacafe5dd1c2f3add7b92e57f7e1ff2 commit 1486bb0bfcacafe5dd1c2f3add7b92e57f7e1ff2 Author: Alan Somers AuthorDate: 2024-12-31 20:41:01 +0000 Commit: Alan Somers CommitDate: 2025-01-20 22:41:52 +0000 Fix lib/libc/nss/getgr_test with large numbers of groups These tests create a linked list with one entry for every group on the running system. On a system with about 30,000 groups, the test took 69 seconds to run, and crashed Kyua with the below error: kyua: E: string or blob too big (sqlite op: sqlite3_bind_blob) (sqlite db: /root/.kyua/store/results.usr_tests.20241231-203317-570235.db). Fix the test by limiting it to operating on the first 1024 groups. Apply the same change to getpw_test and getserv_test too, which are vulnerable to the same problem. Sponsored by: ConnectWise Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D48275 (cherry picked from commit d11904b350214943dedb64c7121d4602799d7afd) --- lib/libc/tests/nss/getgr_test.c | 4 ++++ lib/libc/tests/nss/getpw_test.c | 4 ++++ lib/libc/tests/nss/getserv_test.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/lib/libc/tests/nss/getgr_test.c b/lib/libc/tests/nss/getgr_test.c index 28c5e2e98028..f3aef0e1abd1 100644 --- a/lib/libc/tests/nss/getgr_test.c +++ b/lib/libc/tests/nss/getgr_test.c @@ -294,6 +294,8 @@ group_fill_test_data(struct group_test_data *td, int (*cb)(struct group *, void *)) { struct group *grp; + const int limit = 1024; + int count = 0; setgroupent(1); while ((grp = getgrent()) != NULL) { @@ -304,6 +306,8 @@ group_fill_test_data(struct group_test_data *td, } else { return (-1); } + if (++count >= limit) + break; } endgrent(); diff --git a/lib/libc/tests/nss/getpw_test.c b/lib/libc/tests/nss/getpw_test.c index 7525cd28b962..94b8b9373272 100644 --- a/lib/libc/tests/nss/getpw_test.c +++ b/lib/libc/tests/nss/getpw_test.c @@ -241,6 +241,8 @@ passwd_fill_test_data(struct passwd_test_data *td, int (*cb)(struct passwd *, void *)) { struct passwd *pwd; + const int limit = 1024; + int count = 0; setpassent(1); while ((pwd = getpwent()) != NULL) { @@ -251,6 +253,8 @@ passwd_fill_test_data(struct passwd_test_data *td, } else { return (-1); } + if (++count >= limit) + break; } endpwent(); diff --git a/lib/libc/tests/nss/getserv_test.c b/lib/libc/tests/nss/getserv_test.c index d74feb113a69..d7fce475d70d 100644 --- a/lib/libc/tests/nss/getserv_test.c +++ b/lib/libc/tests/nss/getserv_test.c @@ -284,6 +284,8 @@ static int servent_fill_test_data(struct servent_test_data *td) { struct servent *serv; + const int limit = 1024; + int count = 0; setservent(1); while ((serv = getservent()) != NULL) { @@ -291,6 +293,8 @@ servent_fill_test_data(struct servent_test_data *td) TEST_DATA_APPEND(servent, td, serv); else return (-1); + if (++count >= limit) + break; } endservent();