From nobody Wed Jun 21 14:33:21 2023 X-Original-To: dev-commits-src-branches@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 4QmQwK2lvyz4g9l7; Wed, 21 Jun 2023 14:33:21 +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 4QmQwK29V6z3DlW; Wed, 21 Jun 2023 14:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687358001; 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=6AbPU1JrO5z6z7oU5RjLdTYs55mjnfoVqm4LQoXJX58=; b=IajsV3J+1jyM7GdLw1W6qVY2xzhBPnZ4jv+av21K16vgl2eWF5tHVQyZbg74E7KmEPsq9M YqYeN1yI/vnes3KsQiTDArMydbJ/ClRuzkj5pCp+xg/t3EQMTtvt89Otxw1MTFG//17XkR 4PygJcRmuKTjhQilmjIY8iZbtyX8G2mToGrwllHY/rJARvu2fi7bm1CMiIbsJleAaBHmhx ExbMmDKnnlliWVK/5xebD9d/0d9RhRAYFRQYO5EVJdHcYjU+jZs2bQ/a5sfgkkyHLmYRtH GSE58vj4H7fmYOJDVJ2lwcPl23DGLyRZGnTxT0TD8pVeYb8An9RzCgWZSC4HJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687358001; 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=6AbPU1JrO5z6z7oU5RjLdTYs55mjnfoVqm4LQoXJX58=; b=OXz1jElsduNTwY6C5ZJy3r7xji4AheqiL90+jOhheXBvJs3wpQbeNfOwUS6lEd94+TSeqF GJtGQScHh73CuAoirzpHA82A44HVs1CG/yvmoehlK8iQWUIy2lqUOOwoQCf2PzMM3nRfko CkQNz179Mi8H3fj5pQz8Zt154dtLevslEgmATHFNdDvnR9KUffiYo6f18g2WEipg4v9YF+ q0agyOpi2ysbvwxaUqBtGF7tyV3YEL6cSX/hKI8MKq5h6qifWXen2OckXd3KiUcTfSCbYu 6rC/3f8yzVMtb1qQt+x9WWdBI4YfiZD/XsAI3MByua1gX4RgKIlouLSHmMxJ2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687358001; a=rsa-sha256; cv=none; b=Ur2lvCDjOqPD40HCDKNleNGESkcb1d5H/aguB0dUF0BpBRV1EITBpfVuilqa49XRshUmNv M4LvBGD5BjU6lBMkcSVmUtUa1EOqisP0Sa3yGqqCFImfeWNfYQCmVj/5sl4IYKnrPOkgzC aIOD3tZGUM6QAkc5IYplyQNRgHeSkyvwe+Ck+rv/SLv9zd4Ar7s2I5Jo/EWbSUX4zo/X88 7bbnQRYp6a/AOsbYNknfb9LbHz1NauiByVhCBVIZiJWYGuX439OoNJslfX7bd6OpOhVFKt nVJsBW6N1jqmW+z3V2AFJc08tEBL2vgd7a5C1+DGqPsJ0RaV0NEteEEzya5yYw== 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 4QmQwK1GHqzlQL; Wed, 21 Jun 2023 14:33:21 +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 35LEXL7P040339; Wed, 21 Jun 2023 14:33:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LEXLmV040338; Wed, 21 Jun 2023 14:33:21 GMT (envelope-from git) Date: Wed, 21 Jun 2023 14:33:21 GMT Message-Id: <202306211433.35LEXLmV040338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 12b3082aa072 - stable/13 - pf: fix pf_nv##_array() size check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 12b3082aa072084d381720cf8af1ed9503d906f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=12b3082aa072084d381720cf8af1ed9503d906f2 commit 12b3082aa072084d381720cf8af1ed9503d906f2 Author: Kristof Provost AuthorDate: 2023-05-15 17:40:32 +0000 Commit: Kristof Provost CommitDate: 2023-06-21 14:29:01 +0000 pf: fix pf_nv##_array() size check We want to set the maximum number of elements we'll accept, not the exact number we need. MFC after: 3 weeks Sponsored by: Orange Business Services (cherry picked from commit 76c8f202a4f6a3190e102a0bc1589bbfc179abf6) --- sys/netpfil/pf/pf_nv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_nv.c b/sys/netpfil/pf/pf_nv.c index e2af55af86e5..11f99ce23fac 100644 --- a/sys/netpfil/pf/pf_nv.c +++ b/sys/netpfil/pf/pf_nv.c @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); if (! nvlist_exists_number_array(nvl, name)) \ return (EINVAL); \ n = nvlist_get_number_array(nvl, name, &nitems); \ - if (nitems != maxelems) \ + if (nitems > maxelems) \ return (E2BIG); \ if (nelems != NULL) \ *nelems = nitems; \