From nobody Mon Jun 30 15:00:55 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 4bW8Vc5wh0z60ZQL; Mon, 30 Jun 2025 15:00: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bW8Vb63rSz3DQ5; Mon, 30 Jun 2025 15:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751295655; 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=uzlQwMrnpK/0MCCgIuXHf0d7PGcn5sRnqGfHO4Y7Nfo=; b=OBS36vW0K0tNuvuIliC3o30Hz7nPknwhpO3eHsyLDYvwVahWDVD28zp/hcThN+Hz411lsI NvT4vkcsBFZDEmkT4wSKkKnAEy63H9jKdiWgKF5xHtCp4qKBI2Mc5pCxI3bINxXI0RLdCh oiWqGYOr6uTmw2/1eu6D+HNqPoGgYzgHzZ6GZxBmFoFkj64OsQ+zolODyPoz3TXS4iNeQq Jq4cTBdcgJnYmgnBevhfmBUz4hsVUX0GlfKvW8sR70t725dDGbEJHrGy/ViCbK8SUBntMi MhN/kvPXLR1SqFvGlH+88sUEoM5k/SDEfmPOFWUHNynC5fjpmbfyjBC1FOM/CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751295655; 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=uzlQwMrnpK/0MCCgIuXHf0d7PGcn5sRnqGfHO4Y7Nfo=; b=bxlLZZpwHDfBp0Ak6lfrE/2YfF1LHu/Opf85NIiCmFBzsm85ldXlhEPxt5F4yJ8mOFWK+T EsMZKU2QxB1WuvXoDg238cYAgAa6WCcc+stqG8f4vgcehJPIg5LxJXTO5dVL1qXodNcWAF 6RhgqBY242fYAYoCAI/eCyLsTlNpgBT8u5ZkGc0aH7ye+AeWQGVBF1XWXBKeBpaLnBdbw0 YV0WbWc9XiRWNyDh07lCaf2D9eU/9HQxcR8edE7/+/w9QS1oDyKk+jxlrce8MGVthwqfid /DnsUNbtnwZoDrGqDNz6C/KuWQrG5m8M+bA7K8Nv7agHj7+uOL738cP7uHvPow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751295655; a=rsa-sha256; cv=none; b=GUnS/77u8+mgozZ64ziOhmyV8u723H4VVIl/0Ta+N8zeuzPn3r0wNDAPOzJsrbHJj4JTE4 M93r7rFZdiUJT8caY91QrAkhPmd3YSzHLyRkV2qGzGG/vXE2v0d8phIKbkDnqITxI4TtPT 0SB2VunTkFdFaq5RgJ48f7HsiF7WjV/UqTVD43FKONbSuKCwYu7hTVWvR/Y1sIWHa44kpq TMSbQDKjgSeoXvWzawQiUxhEyMCCdSAIh4QI1ssZXx8/ZirxDzP/frfI4D6VtgrsMhRLhL 7K15NK5CDpWDbiUx8CYpCvuuQZ0ULXwB1dlguAuW+dkStLyFsZNEFBmrwtwvCw== 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 4bW8Vb3rdXz17cY; Mon, 30 Jun 2025 15:00:55 +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 55UF0tIK047654; Mon, 30 Jun 2025 15:00:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UF0tNF047651; Mon, 30 Jun 2025 15:00:55 GMT (envelope-from git) Date: Mon, 30 Jun 2025 15:00:55 GMT Message-Id: <202506301500.55UF0tNF047651@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: e790bcd784c9 - main - pfctl: Use error label in host_if() 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: e790bcd784c995f7aa8f730d1de1b6c5de5872b2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e790bcd784c995f7aa8f730d1de1b6c5de5872b2 commit e790bcd784c995f7aa8f730d1de1b6c5de5872b2 Author: Kristof Provost AuthorDate: 2025-06-27 12:23:34 +0000 Commit: Kristof Provost CommitDate: 2025-06-30 15:00:28 +0000 pfctl: Use error label in host_if() This brings it in line with host() and host_dns(). OK sashan miko Obtained from: OpenBSD, kn , d127311405 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 0c5f184106cd..d903b592b1ac 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1852,22 +1852,18 @@ host_if(const char *s, int mask) flags |= PFI_AFLAG_PEER; else if (!strcmp(p+1, "0")) flags |= PFI_AFLAG_NOALIAS; - else { - free(ps); - return (NULL); - } + else + goto error; *p = '\0'; } if (flags & (flags - 1) & PFI_AFLAG_MODEMASK) { /* Yep! */ fprintf(stderr, "illegal combination of interface modifiers\n"); - free(ps); - return (NULL); + goto error; } if ((flags & (PFI_AFLAG_NETWORK|PFI_AFLAG_BROADCAST)) && mask > -1) { fprintf(stderr, "network or broadcast lookup, but " "extra netmask given\n"); - free(ps); - return (NULL); + goto error; } if (ifa_exists(ps) || !strncmp(ps, "self", IFNAMSIZ)) { /* interface with this name exists */ @@ -1876,6 +1872,7 @@ host_if(const char *s, int mask) set_ipmask(n, mask > -1 ? mask : 128); } +error: free(ps); return (h); }