From nobody Thu Oct 30 04:36:56 2025 X-Original-To: dev-commits-src-branches@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 4cxrtJ6jWYz6DkyW; Thu, 30 Oct 2025 04:36:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxrtJ3L3yz3MPc; Thu, 30 Oct 2025 04:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761799016; 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=QwpFjcn2doGzrv9haqypWmOf1VOrtqM9WL9HLj0GSMo=; b=wiicwdNmtyjng510K5iYIfgJAWMnUDIYERWGq7Vekju0vT1qwWymBjPWXrekFXEh/hweMx DYQUxysCKKSItRXOLhjFtybAMbJt79a6SKT8sWILSGKfL3XsfJy3XZnGIH3fl60ICfLTMl TknLBuxOeA3R3bVymtkkfbS4v+mzIvsCVOrcxlnuEvWmDXC8ATmm7TsvGAkcWnwmJ5P5pk RFGyhE7zIDfdNQGMvZIuf1HRRrGD25eZxbju2+0Ft88BXc0NVuoj8Ti6xWQP42hAihKaoS cIvgcCTCwZI81N8q2ZeHfM7fXRkpPbPgoGbwfoiVMKAFNgQ0imtwZqMMgBkt3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761799016; 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=QwpFjcn2doGzrv9haqypWmOf1VOrtqM9WL9HLj0GSMo=; b=B1ErsI+fohL3hl3w2zt3/+ZtIUYdKGZGeinsBfbS3cahgUKBRjMbPIf0b5F4kU9XxzNRF+ fK+zb3Lya/TUiyhgbr5d1sZiw8J08ndwLf/uMWTgJUctXiKFplkGFAOxhFJ0qZ8yhGc2Ck iKRi2dfS+ksHQHJrsOaUP6AlmH3qBH4c5AX5NzMN3/2ox9ha6dAGiES3fPLGqFe+lqVu5J /YNuEKRdGqlVvcrB23ZItDIodnj0QAjLSTxtB8OMNliOkk2S2ykWhSFT9V7HVYAtU/m6Lq mBlUnKW2r5svr5gFKfPqQH0xmvk4xf4I4LgSC01tFzuX8+sW97I6ZqL/rZ3T6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761799016; a=rsa-sha256; cv=none; b=pDfLSnkZlHPkZHBuhIXmTATvjH/twAUrD/3QSAx0W0DKRDCN6MSSWa6Kun6r4sA/qp7zbQ AVhlh9fgggSNpwFoSsJNlvxU44BBzi9V1CqC34qmzBRn6E7Bua+xXCEZasJ5c0eemT76hW aM56Q6mdedbnmQB73u5UkMJiEDLWovPQfp1/MuxasZdSr4yr/E81Ky4W4GCkziOZ1V/HhR u8VUjukMa5V1YSJXl5N3APDvX5Ve2DAbu473g0EbsqDQdHKMOTA4icHQZTxs/KyXTsK3GJ crC+MnRaaD6CS6JhTg1MVR6BMJEus6EjsRdmSztW7GQtP5inNokTt+cx/dcc3Q== 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 4cxrtJ2qm6z16rZ; Thu, 30 Oct 2025 04:36:56 +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 59U4au9l005097; Thu, 30 Oct 2025 04:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4auC9005094; Thu, 30 Oct 2025 04:36:56 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:36:56 GMT Message-Id: <202510300436.59U4auC9005094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: bc59efc45ce0 - releng/15.0 - blocklist: blacklist: Chase recent upstream changes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: bc59efc45ce0bfbca1f8b57dfd40859a6db18caf Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bc59efc45ce0bfbca1f8b57dfd40859a6db18caf commit bc59efc45ce0bfbca1f8b57dfd40859a6db18caf Author: Jose Luis Duran AuthorDate: 2025-10-27 15:01:22 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:36:41 +0000 blocklist: blacklist: Chase recent upstream changes Upstream introduced a fix that avoids blocklistd(8) from running into an endless loop when it tries to delete an address from the database which has been added multiple times. Apply the same fix to blacklistd(8). Approved by: re (cperciva) Upstream PR: https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=57193 MFC after: 2 days (cherry picked from commit b502a451cbae6a85636c7b8375f5ee53caca4388) (cherry picked from commit 528e1d14037af30003b4451ec6f1686ea674621f) --- contrib/blocklist/bin/blacklistd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/blocklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c index b5f9358122ef..cb6ce6578d9c 100644 --- a/contrib/blocklist/bin/blacklistd.c +++ b/contrib/blocklist/bin/blacklistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $ */ +/* $NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ #ifdef HAVE_SYS_CDEFS_H #include #endif -__RCSID("$NetBSD: blocklistd.c,v 1.11 2025/10/25 16:55:23 christos Exp $"); +__RCSID("$NetBSD: blocklistd.c,v 1.12 2025/10/25 18:43:51 christos Exp $"); #include #include @@ -329,8 +329,8 @@ again: (*lfun)(LOG_INFO, "released %s/%d:%d after %d seconds", buf, c.c_lmask, c.c_port, c.c_duration); } - state_del(state, &c); - goto again; + if (state_del(state, &c) == 0) + goto again; } }