From nobody Tue Jan 13 18:10:02 2026 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 4drHN01pXbz6NW0V for ; Tue, 13 Jan 2026 18:10:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drHN00qlYz3sgc for ; Tue, 13 Jan 2026 18:10:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768327808; 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=59HfZFDMk/kmSPYVKxgOmaevC3YyfDvd4h5VviUb0dw=; b=qkEVLsDWwcX/PkHl9D0Q7FVn+m9R2z/mv/4czbwpHbLXl8P+wV/Yd8UVfTJHMsqONLwrFx 1AIGdaDqhV9MX46F5vY4eBQHCszBuvBNtlbBO/m13fKRaymDiWXNTP3XpAqPfm7PKMrmVP dNh+UMx+t4na4+ybp+wWmFzIyWH3rVZfHZ68CgNlkN5zvFWnpx7Syo7bu6PdaON6MOwtEn 6U0LSfQMfFk935qD9IjPtopyZo2GAsTHhkoU++TK1sXCnH1btKZyi1caw8UsFLQv6xbMa1 Jta+EB9yyAYOczZ8FI+C/7QPhdiHJoAYjPvtUsh9vOBZLyytNBVGP/4ARFBswg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768327808; 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=59HfZFDMk/kmSPYVKxgOmaevC3YyfDvd4h5VviUb0dw=; b=NrZkitA5ny87qo/FBKyvjFpwhKTZZyhvS5xaeleI6R5s3s7s9SO3hQfkGtTvpHfS7CyVrQ 4EsGALowydNr/U1Xx9GPMOSTjBv7mXOoTM4z/wrt4WNKBKd3lop2UwvKMOFw+pLU/4kjZJ wzhL0owNg4S9X+EhPVigRlWM60QjV46g8ZCYrUlMCThKtP0CjXWJIKmyZpiJ3Vzuz1gUQF WTDkqNZvEgGEqaF8bV9fer94MgEuvZLjaOxCAjS+tJ9DQdodqF7UxDoFpEb+ADjPggzSyf uJbfz3z4cT2TK/saPpYFv7Amy0AV80zM0UoYk31t8UYeai3Gi0e7KG6QKaPu4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768327808; a=rsa-sha256; cv=none; b=K2zSoFuVZgK/2EVYFOuSXmR/6ZAnxW9ICRtUTu3rSPZLn8I0vEnNvWLeD2Qclgc/LNBOvn Di2ZM7BwEdjRqfAnpn+1r+O8CUow/k8hNdMwYTTZ5AtfdqfbsRaADT+TN9ZbB95T5khZsU e74ZplvNoUTdTywGMtlvqHbvRwkNfm5vPMzg7Us2Syb52G10qyuyogQkrT6kjXpGabswDS tRJ08ud1CrF87sRYO5QU9iWSzTVcb3fHMxItTUaxCx6S16gH/d43Iwf6dGQEkwZjEEATSL h6gC/wE5RrKrJBP+sskOwkQRtw2T3xkFpD5hUDTkL9MSWFHEEQPKvsGkTh4Vig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drHN009Rhz7d0 for ; Tue, 13 Jan 2026 18:10:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aea5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 18:10:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c1376acb8a9d - main - ipfw: find_tentry method is defined for any table algorithm 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1376acb8a9df03e5e47a78dbac5347d036116ff Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 18:10:02 +0000 Message-Id: <69668a7a.3aea5.129089d0@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c1376acb8a9df03e5e47a78dbac5347d036116ff commit c1376acb8a9df03e5e47a78dbac5347d036116ff Author: Gleb Smirnoff AuthorDate: 2026-01-13 18:08:49 +0000 Commit: Gleb Smirnoff CommitDate: 2026-01-13 18:08:49 +0000 ipfw: find_tentry method is defined for any table algorithm The error path is never taken. Also the path was leaking a lock. Noticed by: ae --- sys/netpfil/ipfw/ip_fw_table.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_table.c b/sys/netpfil/ipfw/ip_fw_table.c index da52166f8062..96f550e66e4c 100644 --- a/sys/netpfil/ipfw/ip_fw_table.c +++ b/sys/netpfil/ipfw/ip_fw_table.c @@ -1031,7 +1031,6 @@ find_table_entry(struct ip_fw_chain *ch, ip_fw3_opheader *op3, ipfw_obj_header *oh; struct tid_info ti; struct table_config *tc; - struct table_algo *ta; struct table_info *kti; struct table_value *pval; struct namedobj_instance *ni; @@ -1060,7 +1059,6 @@ find_table_entry(struct ip_fw_chain *ch, ip_fw3_opheader *op3, /* * Find existing table and check its type . */ - ta = NULL; if ((tc = find_table(ni, &ti)) == NULL) { IPFW_UH_RUNLOCK(ch); return (ESRCH); @@ -1073,12 +1071,8 @@ find_table_entry(struct ip_fw_chain *ch, ip_fw3_opheader *op3, } kti = KIDX_TO_TI(ch, tc->no.kidx); - ta = tc->ta; - - if (ta->find_tentry == NULL) - return (ENOTSUP); - error = ta->find_tentry(tc->astate, kti, tent); + error = tc->ta->find_tentry(tc->astate, kti, tent); if (error == 0) { pval = get_table_value(ch, tc, tent->v.kidx); ipfw_export_table_value_v1(pval, &tent->v.value);