From nobody Tue Nov 07 15:47:25 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 4SPszf1pBDz50Wqd; Tue, 7 Nov 2023 15:47:26 +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 4SPszd6NDTz3JrQ; Tue, 7 Nov 2023 15:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372045; 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=8K2aQKXbEqY1TH69I6KAC9Xh75ldvMXjOePE4EwuoVI=; b=En2dO+AATqY1V2iMz/HQ7eTE6LK/pe2BqsANhyHD4kGrnR3hQJa1SFk44PUEPE09m5QPyE Imz1PChvC1/EVBUhvUy9Qh3PeEc6l7kqaMWFdKK97osA47tUY+RGw60SxtGJordb0R7eno SUHgLnvMTs2OEKc4HowjWAsU2menZqpLMbfW04VvYRfPUcdCugkV2sGBwxhW3XPyQO3STf 8fgucrXa6F5EZb/Y9VN9htttO3j/6j6hANOMbNHmziRBOZVnSEO1HUzGdvTI05uG4pxelY OJgR0EQFieCe8Mjk5bis84xyrZmCTgkhPbT6PdzOqA1+6xX05sh54iIeKHMKUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699372045; 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=8K2aQKXbEqY1TH69I6KAC9Xh75ldvMXjOePE4EwuoVI=; b=IFFysL24xQG67o/igs6DyNgzGJ5bfcjZ2uoDxO1qAKCZowZoyQ719PCsC3jEHkwYCoUaZx x8AHMYKGKP5FZ44LIQWB7miZZ+l2975bGYEQkC0DiX7L+71u0ImWt6w7WQhm6URoZzryRi Ra0ZfnWjx4H9WSCLhFdOL+Ah8bty10TEiqoxUW8SIFMdT2SBDhDupk3XXgSCsOFcxGibW0 Vr9GvIpfL/DMF5j0FRjuWpA8PP+IzldBen9NRJNExq8aRrGOfZRcxxMtvPbbho6NdAdNLx 2jQR7bXxzfM4AQGzij2sU6U5GCNpMspaR9CP5xcgeM/PzibmUmWQajM6K0H+Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699372045; a=rsa-sha256; cv=none; b=e4/oR9uyTO6V7GPoZpsxkpMdktTavaRhDp9yFNfMgKN1cyPiTAsQ/m8E5S01G8vcJJB8QR z3vY3y5/WiElVQvUwi3pS5zGSPaw3Yk+WYhBklJ2FSxbGxC2nIfHGi9UUr5FFHiYZEywby RAaCCSIoocNAgB7RvFp/yIXMbxhNK3u8Tdr80n3YFsUZ9aI1KQvFsYjoibvXaRMImGB5zW XwXQjKJPfS0DrDV3NFaSjMyC3NoEgx9UNhYA6OUxW9LrjX2zJo1n6TAvhs8GwAcxdzACDV lcMfPRYACoZNRn/PX8R/5/DimduR8vxvo+1hFipCQ7hf9/3cAV6MmgHRxRoEew== 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 4SPszd5V60zwC4; Tue, 7 Nov 2023 15:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A7FlPHe070012; Tue, 7 Nov 2023 15:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A7FlPZE070009; Tue, 7 Nov 2023 15:47:25 GMT (envelope-from git) Date: Tue, 7 Nov 2023 15:47:25 GMT Message-Id: <202311071547.3A7FlPZE070009@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: c17db80ddd57 - stable/13 - libpfctl: be more tolerant of kernel extensions 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: c17db80ddd5743dce59552dba4bd7c243b748a6c Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c17db80ddd5743dce59552dba4bd7c243b748a6c commit c17db80ddd5743dce59552dba4bd7c243b748a6c Author: Kristof Provost AuthorDate: 2023-10-27 12:13:57 +0000 Commit: Kristof Provost CommitDate: 2023-11-07 15:25:02 +0000 libpfctl: be more tolerant of kernel extensions Allow the kernel to supply more array elements than expected, but cut off when we hit what we think the maximum is. This will improve forward compatibility (i.e. old userspace with newer kernel). Reviewed by: zlei MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D42392 (cherry picked from commit 2b1eb63fc9c6d6f64baaac59b7ea7c2a3228c03f) --- lib/libpfctl/libpfctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 2a77aeb0efad..bf25a45b792f 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -145,9 +145,8 @@ pf_nvuint_32_array(const nvlist_t *nvl, const char *name, size_t maxelems, size_t elems; tmp = nvlist_get_number_array(nvl, name, &elems); - assert(elems <= maxelems); - for (size_t i = 0; i < elems; i++) + for (size_t i = 0; i < elems && i < maxelems; i++) numbers[i] = tmp[i]; if (nelems)