From nobody Tue Jun 28 08:43:41 2022 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 51C2F86E1C1; Tue, 28 Jun 2022 08:43:41 +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 4LXJ651p1zz4lmd; Tue, 28 Jun 2022 08:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656405821; 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=W+13gP3rpTxuoZtXdpnDsHLOAICPJ07DWL7qF8t0Vs4=; b=gxNSPk0blrdOI3qmFv9w/nbDSBDi2EDXg1pnOVKtNFTGfhJgd68Fs8Fnci7tQx6EO7zfXH smD2o69FzeGo5iqVTMBp354zhsH1NEMyZofsb0SNDFnddFaphtc65RujmJjbEXIG/CzvWK GpQJJ7+bdUkDsVsSHxXrT4Fnsmexl/rUHgP4lCyIWiN67hISvroMlZQ/HRVOVdBv9OkOSA lDU+S92YB8Oob75cG5yS6TFDo8lPyzKslB4gXxgTbVPfrg+q8C4tzc9VWN1v50tgCrp6zI 3p9f3I3mDqFc7eNGSkLi1aV4FumIg+a7ZctMIfJtSau8q5ATATZiZgb6steL1Q== 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 1EEE7199CF; Tue, 28 Jun 2022 08:43:41 +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 25S8hfZc097820; Tue, 28 Jun 2022 08:43:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25S8hfUD097819; Tue, 28 Jun 2022 08:43:41 GMT (envelope-from git) Date: Tue, 28 Jun 2022 08:43:41 GMT Message-Id: <202206280843.25S8hfUD097819@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: 6f16d78c0da6 - main - pf: add missing maximum length check for DIOCADDETHRULE 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: 6f16d78c0da68f1e72bc6fe4c44446dbcc47a001 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656405821; 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=W+13gP3rpTxuoZtXdpnDsHLOAICPJ07DWL7qF8t0Vs4=; b=FRcNhI0yEDkegTF1oNiaZHB6Jn5s7/6E0SKcIkhlOKj3KYVHGtN9qTQUStidgG0uuGR6nV 4Pm+1IzLquV6N6TdE3scw9uCBtkD51pelF4P7zAUOWeEprth9uDVwGr7mzMASXAhbU9fjN BESEbE5uz1TDpTDPH6EP589tV86z/lA3o0I6wzulTBbC4RfU4lJF5JOl1ngiP2Y7kWjQld JDHvIqSVqqWrCFOz7Xdhug4jd+y5DhHjYwgpPOOEw+cYchEyvJb19RQZAmnQnYPM481HFb TYNQqyDjLOzcCijzQapeoNVduDber0hZcNTEUL9oZ9gxnUmGgpc4mNy/Yfihfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656405821; a=rsa-sha256; cv=none; b=hQaySglxlQHEPvagbPOcOK9c3B3Vq3xJgrkkTWI/fNrRGscZTrytf48+ea9X7YkRF9R3JW z0w8LqX+Mhsy1Ix+uip1xLnDwigCDa1D7TDp/WQxKY95nL+26/2oMYZgZCsFD3yLslpJno YoBWKThjMRruy8QrnP/cfQdYnPSgB/QPtwjRPBnuju7k3HTLJF2BUhl0peme5SftDVcQi6 IO8K1AkOzT5fHfMKco1Gxc+YTBHfU+4j2VfwPTCY57XJHTql4bNwgKmaJi9HXTRqawtdMS TSop6JX6Nd0+p7/cFu18zcS3aNLKn6jdT6qIEpaTb4L+JM7MtPLv+n9GlIk8ZQ== 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=6f16d78c0da68f1e72bc6fe4c44446dbcc47a001 commit 6f16d78c0da68f1e72bc6fe4c44446dbcc47a001 Author: Kristof Provost AuthorDate: 2022-06-28 07:43:23 +0000 Commit: Kristof Provost CommitDate: 2022-06-28 08:31:23 +0000 pf: add missing maximum length check for DIOCADDETHRULE Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index c07df7e6c05e..c50369a23aaf 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2821,6 +2821,9 @@ DIOCGETETHRULE_error: #define ERROUT(x) ERROUT_IOCTL(DIOCADDETHRULE_error, x) + if (nv->len > pf_ioctl_maxcount) + ERROUT(ENOMEM); + nvlpacked = malloc(nv->len, M_NVLIST, M_WAITOK); if (nvlpacked == NULL) ERROUT(ENOMEM);