From nobody Wed May 31 16:09:06 2023 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 4QWZ2W0rtzz4XBby; Wed, 31 May 2023 16:09:07 +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 4QWZ2W0HjJz4WZd; Wed, 31 May 2023 16:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685549347; 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=zUyvXeHWYosJdFkoS/q+O7hDulrHb1uA8WFNB9Zsurs=; b=liIM3U5P9noQO591KIOmP/XY8EyGaMo7lXA7BzGEoSsUuiiQT3qn80i15dX/SYBhs5yLYF kQcuy2s2MrLVSOx6Eb0kPiNczXoBJVqEXoKSJTpQvx60l0V/qcdELa2omXQCywZ0nK1iZC MDOsBLYBmT5KlWC0mjDkzViK1RnuR+W1w065HeEtITWHSrZ6NNUNnWxuAIvkPN1jMYk7Pd VSwJj2H2VQ41BYmY8IP3BNifecdkT11hVvkeBtPRLrZzTLH7qPpbvw1McN62ImJvt87nGt cF057XM+ZBPBLdZS4iW6/cSPGbeBM/kGhGTNUUVIDTFm9EQmejjl3lUECkiLlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685549347; 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=zUyvXeHWYosJdFkoS/q+O7hDulrHb1uA8WFNB9Zsurs=; b=bz6EU7BRI3R/vLLknEm29PTAPlG0TpA49qCiZ9Rkwu0BVXgY9sMJFFxJXvOHtOivBaifj4 1eVKi26PDDJNIY0/ScWRfkqBmVUiizijv1NN20WpSrzZxJvN1tA/wggkrYIQhtzuo2KeEl LLGnVBSWTrASQIaY92oZlgmjLG+2f1kNGQLnNGjpltuZ+hxODVpjA+mV6pwshVENeqVPNy yiD63HHgN9SgETF7op6T0bT5tysjDoJV47g4YsRbvmU3iSn8yAL5U2xdNVhYEjDW7ascxE ely8jO/00nceLxKN3yvCUdugOTFl6vJBLCSWE75a5htoLLKkwyo9gUqRga59yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685549347; a=rsa-sha256; cv=none; b=pejcM7gXBzlLjVapnaIivh7jUUZbQ3GdJ9RENJFOJ6N/yvgcCNon2yg2YLlZav4+MUQA2m DU5JFcc8z5XL3xN4Wro5/KNj5NV18u+Rq0Muz/U03OLgkDSu6wN27LAW8YSyO3rLwVQrC4 pvWKs06rg+SwGs2ekfUAlYJ8Zpy66ghP0T6PNn/MArtUmZ6EXK+sXWb1gqnFQaX9UNDGRe kbg1QcWchChPZLwC/N7glFn89FjgCFgU1zmmF5WS0KO8rzc51ueIircHJwOLPObSvJpd/6 Hmc+xlOEciE/GAj+uCY1Pg/kamOoeIYEJEvX3Qv2AIPAU2UT/GFmvi7SiDiNlw== 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 4QWZ2V6SzKzhXq; Wed, 31 May 2023 16:09:06 +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 34VG96LS092542; Wed, 31 May 2023 16:09:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34VG967I092541; Wed, 31 May 2023 16:09:06 GMT (envelope-from git) Date: Wed, 31 May 2023 16:09:06 GMT Message-Id: <202305311609.34VG967I092541@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: 76c8f202a4f6 - main - pf: fix pf_nv##_array() size check 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 76c8f202a4f6a3190e102a0bc1589bbfc179abf6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=76c8f202a4f6a3190e102a0bc1589bbfc179abf6 commit 76c8f202a4f6a3190e102a0bc1589bbfc179abf6 Author: Kristof Provost AuthorDate: 2023-05-15 17:40:32 +0000 Commit: Kristof Provost CommitDate: 2023-05-31 16:07:58 +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 --- 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 2e813bc49f9a..aefd0268dde9 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; \