From nobody Wed Jul 09 08:59:11 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 4bcX333x6jz61NQ9; Wed, 09 Jul 2025 08:59:11 +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 4bcX331NT1z3cZG; Wed, 09 Jul 2025 08:59:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752051551; 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=b6WRYVMccrXdDIVM4tuhi+nnMXXCunxGgEZDUqGEKWE=; b=xxWAOG68YLQWAAx6R41Fu07vOEm5YAzs2to/J+Tt4EedEW3BSIAzfh8hipI+Xlt3JxXozc SsA2Q5nfY4sycr9n/49TNICuGTAXarIr2nYabtxU0Yg4bdACovIOUDuZ8friFXrxsoFR7m gOnFJzR91eej3I9KSrBWzvu8EjD3MqsX30Moo3Q26Os1KDbrjyjm56IHRJL8tW+C6OK/fJ C07sDF4NyRWtaGERdFg3NFW/Ox8rCV7W9gieQocyKlTjnH12Opi2Tr9/uAVx2avWhkNbM1 wk6507XA/iIRZ6Cx/uXUvtlIy8uCXGUNZPM7l8tZPkDpyD1xayvvQ4aqmc299Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752051551; 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=b6WRYVMccrXdDIVM4tuhi+nnMXXCunxGgEZDUqGEKWE=; b=hfNxv5WWcdRc0lmcFwxYZM9dJdvrp1LVJqbC19AudQ7GfYL2nc9WACqSu7XCFL7ITu63GL 39GK61bpj/Bz9KkHQ20EVWXfbwCSOF06LB/JfJqnoA9qnFP+Hr5KeVn4OroRriXlsUsPXP mX5lcO3gklBkC4BKhmDfP15SjVqO25hP+ubTOEZczNcbU5ZPczuZA7W9KJ9k4ZSLrM2kjn ZqJeOit/XBlsFqPJvJM015pky3o1IU17Ad8RYqOBv0mYdaTSsA4Nwu+j+U+o1gnw1/7+qA SKXqLmuDj8TsPN5G3tM4B+drLi7bYSgznZoJBgrhuLj+Sm6XZF6YX0WCl1Aifw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752051551; a=rsa-sha256; cv=none; b=F1D2UBlXCVb2C13x+DnvlLpU0nl4/xtv0YF88AKDGUXh/Nygbl354FtvfrQ5OaHm8zZmCi Pdmh4Mdk3Zq5TGMUYvQdm0qnvOdfUXGIY9QkBd5G3YuS7WDdHkucLg0rPY3PJ/g+oWPElQ Is6IQBE+4uKn+XR/JJsipcbJ9uWPDVoJ2a/xi/0fhYxD4GoE0W/nSZ4uT5R2p4c8j3pTYt j7CyqaU3OVW9mekQeVeVa6f5JF4x/knj+NAA2naFkxxtBDu0wKBHYRuK76BNZvBCsjRxoN vDsCNGxm5cOKss339ffexiMD6IHFZiyDpGisrivJ82oj/1P2ZCprh+528m/eKA== 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 4bcX330w52z192; Wed, 09 Jul 2025 08:59:11 +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 5698xBMB045096; Wed, 9 Jul 2025 08:59:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5698xBgw045093; Wed, 9 Jul 2025 08:59:11 GMT (envelope-from git) Date: Wed, 9 Jul 2025 08:59:11 GMT Message-Id: <202507090859.5698xBgw045093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: be763b0e57be - main - pf: clean up pf_ioctl_addrule() error handling 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be763b0e57be7de314c543452ef909f0e65a29f0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=be763b0e57be7de314c543452ef909f0e65a29f0 commit be763b0e57be7de314c543452ef909f0e65a29f0 Author: Kristof Provost AuthorDate: 2025-07-04 11:06:56 +0000 Commit: Kristof Provost CommitDate: 2025-07-09 08:57:50 +0000 pf: clean up pf_ioctl_addrule() error handling On error immediately stop work rather than continuing and handling the error later. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 737f9ca060c5..c96741023db9 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2155,51 +2155,51 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, rule->rcv_kif = NULL; if (rule->rtableid > 0 && rule->rtableid >= rt_numfibs) - error = EBUSY; + ERROUT(EBUSY); #ifdef ALTQ /* set queue IDs */ if (rule->qname[0] != 0) { if ((rule->qid = pf_qname2qid(rule->qname)) == 0) - error = EBUSY; + ERROUT(EBUSY); else if (rule->pqname[0] != 0) { if ((rule->pqid = pf_qname2qid(rule->pqname)) == 0) - error = EBUSY; + ERROUT(EBUSY); } else rule->pqid = rule->qid; } #endif if (rule->tagname[0]) if ((rule->tag = pf_tagname2tag(rule->tagname)) == 0) - error = EBUSY; + ERROUT(EBUSY); if (rule->match_tagname[0]) if ((rule->match_tag = pf_tagname2tag(rule->match_tagname)) == 0) - error = EBUSY; + ERROUT(EBUSY); if (rule->rt && !rule->direction) - error = EINVAL; + ERROUT(EINVAL); if (!rule->log) rule->logif = 0; if (! pf_init_threshold(&rule->pktrate, rule->pktrate.limit, rule->pktrate.seconds)) - error = ENOMEM; + ERROUT(ENOMEM); if (pf_addr_setup(ruleset, &rule->src.addr, rule->af)) - error = ENOMEM; + ERROUT(ENOMEM); if (pf_addr_setup(ruleset, &rule->dst.addr, rule->af)) - error = ENOMEM; + ERROUT(ENOMEM); if (pf_kanchor_setup(rule, ruleset, anchor_call)) - error = EINVAL; + ERROUT(EINVAL); if (rule->scrub_flags & PFSTATE_SETPRIO && (rule->set_prio[0] > PF_PRIO_MAX || rule->set_prio[1] > PF_PRIO_MAX)) - error = EINVAL; + ERROUT(EINVAL); for (int i = 0; i < 3; i++) { TAILQ_FOREACH(pa, &V_pf_pabuf[i], entries) if (pa->addr.type == PF_ADDR_TABLE) { pa->addr.p.tbl = pfr_attach_table(ruleset, pa->addr.v.tblname); if (pa->addr.p.tbl == NULL) - error = ENOMEM; + ERROUT(ENOMEM); } } @@ -2207,7 +2207,7 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, if (rule->overload_tblname[0]) { if ((rule->overload_tbl = pfr_attach_table(ruleset, rule->overload_tblname)) == NULL) - error = EINVAL; + ERROUT(EINVAL); else rule->overload_tbl->pfrkt_flags |= PFR_TFLAG_ACTIVE; @@ -2230,23 +2230,19 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, if (((rule->action == PF_NAT) || (rule->action == PF_RDR) || (rule->action == PF_BINAT)) && rule->anchor == NULL && TAILQ_FIRST(&rule->rdr.list) == NULL) { - error = EINVAL; + ERROUT(EINVAL); } if (rule->rt > PF_NOPFROUTE && (TAILQ_FIRST(&rule->route.list) == NULL)) { - error = EINVAL; + ERROUT(EINVAL); } if (rule->action == PF_PASS && (rule->rdr.opts & PF_POOL_STICKYADDR || rule->nat.opts & PF_POOL_STICKYADDR) && !rule->keep_state) { - error = EINVAL; + ERROUT(EINVAL); } - if (error) { - pf_free_rule(rule); - rule = NULL; - ERROUT(error); - } + MPASS(error == 0); rule->nat.cur = TAILQ_FIRST(&rule->nat.list); rule->rdr.cur = TAILQ_FIRST(&rule->rdr.list);