From nobody Fri Jan 24 10:25:00 2025 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 4YfYpj2Yxkz5lBc6; Fri, 24 Jan 2025 10:25:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YfYph5t6Xz3t32; Fri, 24 Jan 2025 10:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737714300; 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=f/ACxx4bRdzAbH1KGq0Xq4YXOP3/qw17D/h/drjRaMc=; b=jPBgWyE42k+j2ChQ10kpaLa3B7tIHzqkhOqB/0xTyn0wQ2qHCTtX9WOZZrA7b4nMKXixbv j+SmW+MyRHAomUe3bcAiLqmePRiM9lqcSfVgs1SD+R7mvzzbemG7k9ID/XeLKgTuFjknB5 nrovutUPJ5yNjpRQRG5K9+cHFCWcL47oDRYETCKvgZb4uH8qhVorEVxunKZBoAZGWz/FTj HfZWheBa8J5A9G37xSpDe2QAK9oySzuXAT73X354hk1T2WTZuJgRHK5EauiPqKAqLBL5lL fLBfSUq5F/oCHI6T//k4Z8NziuPt41UMFCCUXeOs7dfFUj9uHywpVjaVJYeHFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737714300; 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=f/ACxx4bRdzAbH1KGq0Xq4YXOP3/qw17D/h/drjRaMc=; b=G2iNXTeQzv0ATV/lnRFGg0lhB1Wi6uYEF8OmgADyscMmPvnydgTQ/q2Ql00u3f3l+iO2TY gn5tOSrqOIf+Zzpc25wLqGa6DY4WsBNszUHHEI88MfWAx/A1p/lBsegu2SgxwG3t5x1xDU OM4hcL2siHiII3LRAmWVSehkrxyJLc1KEveXAJA31IdTsYQbpzngHWF0kJjjsLl7X3lFjh Lup3lzB28LyBQrzQCWlj69ht2ufllsEs1gqnUkfDjQW5/Xv7UV5prCC6h/6FHK8tm0a5Wa Gk4vBULEzf7VOJnF2NlCLjQY9+UMBUJ7BBI12AJxFmPe/lqy53JBV5VQ4rUPyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737714300; a=rsa-sha256; cv=none; b=H53eFJj0q/+m0605VJbahbzHug5RUcKQPPwKVbvDjMSvMUBKiGMnWMD2JCK9ZmwwNtOSkL 3RpR49QgvUmbHEueGZTF2Pxs/YuZS0qYZWMSbs+IsKdKLBJVcC3dcB02uFOaVvWNaSTP/W FayIwLOSzqlefJKq/ZLb6goNujXn1DgDs/Pq+9DVuZk69M0+eVMTWtGGn7Qy5NiA4/tbig 2H4xAoHyBCTKNHW3D8cJQCvud6Zu3cdhi1d/SZmLHT7W7XIQjwy3mp8CVAKEAj6QZMPmX8 znrhi8Eiqbx5ba7C2dNarP6aizeTMntwsU5oGKASjfBCGRA8qjzike+fzTglwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YfYph4khjz5v0; Fri, 24 Jan 2025 10:25:00 +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 50OAP03g038359; Fri, 24 Jan 2025 10:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OAP0tf038356; Fri, 24 Jan 2025 10:25:00 GMT (envelope-from git) Date: Fri, 24 Jan 2025 10:25:00 GMT Message-Id: <202501241025.50OAP0tf038356@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: 3331975ab18f - main - pf: check rather than assert pool type 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3331975ab18f88a519b16e5c4781f5924b191eb7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3331975ab18f88a519b16e5c4781f5924b191eb7 commit 3331975ab18f88a519b16e5c4781f5924b191eb7 Author: Kristof Provost AuthorDate: 2025-01-20 16:19:22 +0000 Commit: Kristof Provost CommitDate: 2025-01-24 10:20:30 +0000 pf: check rather than assert pool type These pool types are passed by userspace, so we must check rather than assert they are valid. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 188681329b43..d206a9f8da43 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2566,7 +2566,8 @@ pf_ioctl_add_addr(struct pf_nl_pooladdr *pp) struct pfi_kkif *kif = NULL; int error; - MPASS(pp->which == PF_RDR || pp->which == PF_NAT); + if (pp->which != PF_RDR && pp->which != PF_NAT) + return (EINVAL); #ifndef INET if (pp->af == AF_INET) @@ -2631,7 +2632,8 @@ pf_ioctl_get_addrs(struct pf_nl_pooladdr *pp) PF_RULES_RLOCK_TRACKER; - MPASS(pp->which == PF_RDR || pp->which == PF_NAT); + if (pp->which != PF_RDR && pp->which != PF_NAT) + return (EINVAL); pp->anchor[sizeof(pp->anchor) - 1] = 0; pp->nr = 0; @@ -2657,7 +2659,8 @@ pf_ioctl_get_addr(struct pf_nl_pooladdr *pp) struct pf_kpooladdr *pa; u_int32_t nr = 0; - MPASS(pp->which == PF_RDR || pp->which == PF_NAT); + if (pp->which != PF_RDR && pp->which != PF_NAT) + return (EINVAL); PF_RULES_RLOCK_TRACKER;