From nobody Tue Jun 28 12:01:28 2022 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 8413D8663EF; Tue, 28 Jun 2022 12:01:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LXNVJ6WClz3hmc; Tue, 28 Jun 2022 12:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656417689; 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=WiSBNwEoy+oGTUmFg0TsQ7KSDL6vdRxydRrOmhoeptA=; b=TKQ5lxw/2ZVcXxPvD3uY2PPsHsMQrx96VPYkxkYjXR5rlovPJWzm7SjW2FtjsUnwJTbtX3 K3YK7IzvrpSWEkCN9qHrb2N99MUIYHmVTb+zklMuT0QQlr02QSY9J0ViZOAuiFqdkYjjZO lqBNiLKplUYqEHSzagW4pCVi+Odq+EFmJvh9Vgxynq2DzLyanU+4KecFkztEtoG3Bmokt/ w3w2Y976rhbQPIanXMM1q/Sw/iuJSW81ah56dCKEunKFvVKgpVYv9cN1IMweT5P+DKSeQu T5xQdBgreVkgohkvKWtf+72rLqe+JG3YxBXiMstnBFAXQZcz6U2Va89MlJIZVw== 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 9B7271C660; Tue, 28 Jun 2022 12:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25SC1SXC069422; Tue, 28 Jun 2022 12:01:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25SC1S6s069421; Tue, 28 Jun 2022 12:01:28 GMT (envelope-from git) Date: Tue, 28 Jun 2022 12:01:28 GMT Message-Id: <202206281201.25SC1S6s069421@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: 8e1c23341c0c - main - pf: reduce the risk of src/dst mis-use 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 8e1c23341c0c1b161f7fe9aa76ca2e399ada9f45 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656417689; 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=WiSBNwEoy+oGTUmFg0TsQ7KSDL6vdRxydRrOmhoeptA=; b=k2bpT8okO0L12eMa8zxZivAVUxYJ2cYubZRBVkrev2+TSs75Bd0Hx2MV/x/bgNgAvqBvgM egjGPXhKAtsoLbSdGn8PjlJr1PYkgKwJTiXB++24YVBwI0bvnMBJ9vXBqAElKYVz41ytxC 8p5aI/HTxqO6IHRKKd4KRZ3skD3LmxpmWzgfHOjzN/0uWcqyCk+LU+EDrnGlnB8Oyph6oY KdiTCtQU51n4zhXIhmbNOPshe4vf4nooMunh+clagBmaFY46KdKxKTHEDAzgBKlH9zwKhF O9pL1uFgSJTzB0hhz2JsE4M7C0VYpTaI5PszrZM3dOJbrQlGR2k3KIfHS5i0xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656417689; a=rsa-sha256; cv=none; b=SdmCostYgwwuDFdkKsrKE5s+yocuc4uOrU7C2yRvSAPCG+ACknw4xPHSYS2tR5We8vD0qE BAY77TPTMdyx2rSOQxsfAeZ5xaQgaC86+RnGSVQF1WDwbS0CeLIk8x/lokFsGttrNYop5B /Pit8x+paG/C5/OwtOuBAbNKifR97FgIVj1Tsx9iJrhw6QEqscaIDWlLwRvff+Lze0Aruj n9pzS5cOXYw+cBAP6Va9qLFBL6Z5917hE0dPv9ttK7gG6uRMGDz0HH2aGBt5CrLge3+WP1 VpDZunaTGZpljkMzSRoDVWI7DrHSehZheZ68j9Avs3w7piKi872+GqhVBP8NuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e1c23341c0c1b161f7fe9aa76ca2e399ada9f45 commit 8e1c23341c0c1b161f7fe9aa76ca2e399ada9f45 Author: Kristof Provost AuthorDate: 2022-06-23 09:11:55 +0000 Commit: Kristof Provost CommitDate: 2022-06-28 12:01:07 +0000 pf: reduce the risk of src/dst mis-use NULL out src/dst and check them rather than relying of 'af' to indicate these variables are valid. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D35573 --- sys/netpfil/pf/pf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 94ec0645fdeb..d9664404e6e3 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3860,7 +3860,7 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) struct pf_keth_ruleset *ruleset = NULL; struct pf_mtag *mtag; struct pf_keth_ruleq *rules; - struct pf_addr *src, *dst; + struct pf_addr *src = NULL, *dst = NULL; sa_family_t af = 0; uint16_t proto; int asd = 0, match = 0; @@ -3958,13 +3958,13 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) "dst"); r = TAILQ_NEXT(r, entries); } - else if (af != 0 && PF_MISMATCHAW(&r->ipsrc.addr, src, af, + else if (src != NULL && PF_MISMATCHAW(&r->ipsrc.addr, src, af, r->ipsrc.neg, kif, M_GETFIB(m))) { SDT_PROBE3(pf, eth, test_rule, mismatch, r->nr, r, "ip_src"); r = TAILQ_NEXT(r, entries); } - else if (af != 0 && PF_MISMATCHAW(&r->ipdst.addr, dst, af, + else if (dst != NULL && PF_MISMATCHAW(&r->ipdst.addr, dst, af, r->ipdst.neg, kif, M_GETFIB(m))) { SDT_PROBE3(pf, eth, test_rule, mismatch, r->nr, r, "ip_dst");