From nobody Tue Jan 13 18:10:02 2026 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 4drHMv1w9Dz6NVmF for ; Tue, 13 Jan 2026 18:10:03 +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 4drHMv0Vjyz3sc9 for ; Tue, 13 Jan 2026 18:10:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768327803; 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=IuvV1pb92svex10K/9E4Ps/GFFbSdCj5HXIrD5w6ceQZnrmYzFWSoB2kVGupoW18wftgXj ArmoU6nnXNO7TANUTkPnLJF92OoiqHbmlffkvq56eoPmORJyDKldOpTqHwPQeWqZFYZKg+ +84P7Ny1bXxnS5eXgfCIB6IgrgkE13y0ISMmgQpZM0WLuSoEDc6/5BVMs7xBBEPuxQheWI ZuJCUIy+nE9CmWIxPpAFDjR1nYKyToIRMQCHu+7f7vTs5oZsywN7BQBaM7tcxAdYNb1yG7 vSROVBeeYhR1YXdmftkZ2+3GmepdsLdRESzk0bvebVzzAt5boFP9MRFw7cD+Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768327803; 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=kiRGeY/YOYigm5HMFkVj3X3RoMrKO1fOpiw0EbmFPYn5hshHD1W8vvwTmlEBdYRNE4nxQV SQFfW4CcMuc1QSTm3wZ+wVyQ7WTZ0RMRDFRKhfN9pMiVashDf7tfuNmVIpotIPWIkwPYaW UE0D61sUSg8vszj/4GF4h531VTfguYqmi/eWfrDuw6moxaryrfeTCVN3hETR31gN3TC/9/ w5p5M3BnSD7sleSZQCt0OF+mKOamNpdPYT82U6L+Iemk919NweI4BV5AzjNcp6Wr1cwhdl ksZ6tN8NUVM/QSAcxosNTaNvvs03Bt9cVBOAQkkXMNYYoWtNDTwDGZsbd6mZJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768327803; a=rsa-sha256; cv=none; b=eqEISKRKwOq0G0uutmYBjN+y4w2OND5dKzo5Sl43AYUarlyhCqox8QdCgOH2oYcN6OqoP9 uRKYo/kgoycXPYg7s23a/wG67p9glHcpqrteXcz3b1Q9J/tByvpWqpnvbbFVIymkLbIox+ +DfDC9/huDwlB1rpStnaa+F5JNnMIEUa1Z/uV32Hy2PxhyfwlZ3oPHzHkfVVsN2TGA72h9 X82/h/88ZfjQcwFfRGiVlm1VZ49ExhCRt2glZGMNN9MukBNhYiFlyGCnKaYvS3FPDt99ho hn3bttt8dZjplaiwEbdaDbJWAptyQNeD2AJ9c5ZhFIyjzwLNmsaRoF53lFY+hQ== 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 4drHMv024gz7cx for ; Tue, 13 Jan 2026 18:10:03 +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 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: 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);