From nobody Thu Jul 31 15:28:36 2025 X-Original-To: dev-commits-src-main@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 4btCfF2nD6z63xmL; Thu, 31 Jul 2025 15:28:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4btCfF0MWRz3MTw; Thu, 31 Jul 2025 15:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753975717; 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=cnKi91Er0TVWoI7II4XdVEkjrOzWkKKX00MfVDoTNVU=; b=eRBXAe6Ioff+U0RU6D7qAPH0DKVrPf2yX+Qp4QGWxgC37F84IIy4zDCZVwr55i8RUxJfCN a7o8/WwQjCav1yg7imSV8BLnnha2AFUfDlWfPVU1/Q54jSdMkAfaxkLqiwYAcyFqAXzd8Y KKulmUYbRtKWjhSZuct4i0ia42Nn9hjhUUvNQ49cojQTrkx7SKq0XxC22ILxCx8PYm7NMP pMhx79GnFyrMSXF4se6bk56XH2fXMqKbWgRNYpIHEAwVS8jGRAISO6EFlTJbGk0jW5TsuG xLp+4ftNBBBz83RXyV/XsJBnFl31bb1ANndWQ8NJdCpYXvUfp3erIrEVQVAp3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753975717; 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=cnKi91Er0TVWoI7II4XdVEkjrOzWkKKX00MfVDoTNVU=; b=GQoCVIUbA09XZfwJcC430fFsQo0zfHz3/xLuzPZjP6wRbiA2bSaV3ut11o+uHvAegw8EKA W91IStrTGmP5zl9YeylqZicP0mTygxajgyLXNpAWlxE6CvL6jRRR03168CXe2NzS9FNbvc vfNeWKKlCD5SOM8X8t6YQvhAfF5C3UEsNYPDykZ7yKxiap0YnS7EXW420SEXV9HE+N4tZj t3ivFYqmXl9PR9gGwmMW0uq7vyXStZbmqdaUYKzDDgVeQcN/3RgGvi61Iicg9ZViQlnUwJ UizbQ2295TKBnRGzV42uWeXcgXGeozg2+MntAz3DpJLCJITpqYRal3Yu573MgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753975717; a=rsa-sha256; cv=none; b=fP25/4txZVomerFktAgtBb7WZmGs9q48yoAA3HJnFGcCaE6ouxoiwcPu7afXLzhMj2UtsI Y5mJfvSgB6ztdZBzGlh5863wXTQeY7Rl6wu3l+LENpRY0CSYNOOjBvzU7r5WdKnavfPXq2 cBYR0xU1YAPu+AAERdnTB5nA9JlmC3Ik4FHVwYpH5CmojSjL8ZEhSg/kP8dys1NN4WEV6x 4tEdOUH8RS3NA97U8lMdFiJxp1IWmkSSW17gDZOc9AWybPlDAWyDOKPAth1e57wLATnEdS dWN8FAUAxv6+m8GPgIXIC5l/unWg3Y386JNNJ6P/yA97ibLB2gdZJ0LDGY9t3A== 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 4btCfD4Hprz16Lm; Thu, 31 Jul 2025 15:28:36 +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 56VFSaYg070729; Thu, 31 Jul 2025 15:28:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56VFSaxN070726; Thu, 31 Jul 2025 15:28:36 GMT (envelope-from git) Date: Thu, 31 Jul 2025 15:28:36 GMT Message-Id: <202507311528.56VFSaxN070726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 3a686b851f8f - main - dbm_nextkey: Always return an error if we've reached the end of the database List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a686b851f8fda625010859d210c8a5615ea93fc Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=3a686b851f8fda625010859d210c8a5615ea93fc commit 3a686b851f8fda625010859d210c8a5615ea93fc Author: Bojan Novković AuthorDate: 2025-07-30 14:39:54 +0000 Commit: Bojan Novković CommitDate: 2025-07-31 15:27:24 +0000 dbm_nextkey: Always return an error if we've reached the end of the database POSIX.1 states that `dbm_nextkey` must return an invalid key (i.e., `key.dptr == NULL`) after the end of the database was reached. The current implementation of `hash_seq` will incorrectly restart the key sequence after the end of the database is reached. Fix this by checking the "current bucket" index when R_NEXT is passed. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51635 Reviewed by: markj --- lib/libc/db/hash/hash.c | 6 ++-- lib/libc/tests/db/Makefile | 1 + lib/libc/tests/db/dbm_nextkey_test.c | 53 ++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c index 1eb01ee0f0c5..b1655fe63d55 100644 --- a/lib/libc/db/hash/hash.c +++ b/lib/libc/db/hash/hash.c @@ -704,17 +704,19 @@ hash_seq(const DB *dbp, DBT *key, DBT *data, u_int32_t flag) u_int16_t *bp, ndx; hashp = (HTAB *)dbp->internal; - if (flag && flag != R_FIRST && flag != R_NEXT) { + if (flag != R_FIRST || flag != R_NEXT) { hashp->error = errno = EINVAL; return (ERROR); } #ifdef HASH_STATISTICS hash_accesses++; #endif - if ((hashp->cbucket < 0) || (flag == R_FIRST)) { + if (flag == R_FIRST) { hashp->cbucket = 0; hashp->cndx = 1; hashp->cpage = NULL; + } else if (hashp->cbucket < 0) { /* R_NEXT */ + return (ABNORMAL); } next_bucket: for (bp = NULL; !bp || !bp[0]; ) { diff --git a/lib/libc/tests/db/Makefile b/lib/libc/tests/db/Makefile index cc181cc81160..771569183584 100644 --- a/lib/libc/tests/db/Makefile +++ b/lib/libc/tests/db/Makefile @@ -9,6 +9,7 @@ ${PACKAGE}FILES+= README ATF_TESTS_C+= dbm_open_test ATF_TESTS_C+= dbm_perm_test +ATF_TESTS_C+= dbm_nextkey_test NETBSD_ATF_TESTS_C+= db_hash_seq_test NETBSD_ATF_TESTS_SH+= db_test diff --git a/lib/libc/tests/db/dbm_nextkey_test.c b/lib/libc/tests/db/dbm_nextkey_test.c new file mode 100644 index 000000000000..67b745efb196 --- /dev/null +++ b/lib/libc/tests/db/dbm_nextkey_test.c @@ -0,0 +1,53 @@ +/*- + * Copyright (c) 2025 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +#include + +static const char *path = "tmp"; +static const char *dbname = "tmp.db"; + +ATF_TC(dbm_nextkey_test); +ATF_TC_HEAD(dbm_nextkey_test, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Check that dbm_nextkey always returns NULL after reaching the end of the database"); +} + +ATF_TC_BODY(dbm_nextkey_test, tc) +{ + DBM *db; + datum key, data; + + data.dptr = "bar"; + data.dsize = strlen("bar"); + key.dptr = "foo"; + key.dsize = strlen("foo"); + + db = dbm_open(path, O_RDWR | O_CREAT, 0755); + ATF_CHECK(db != NULL); + ATF_REQUIRE(atf_utils_file_exists(dbname)); + ATF_REQUIRE(dbm_store(db, key, data, DBM_INSERT) != -1); + + key = dbm_firstkey(db); + ATF_REQUIRE(key.dptr != NULL); + key = dbm_nextkey(db); + ATF_REQUIRE(key.dptr == NULL); + key = dbm_nextkey(db); + ATF_REQUIRE(key.dptr == NULL); + + dbm_close(db); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, dbm_nextkey_test); + + return (atf_no_error()); +}