From nobody Mon Sep 1 21:13:01 2025 X-Original-To: dev-commits-src-main@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 4cG1ms3bc4z65H7k; Mon, 01 Sep 2025 21:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cG1ms2Clyz3rp4; Mon, 01 Sep 2025 21:13:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756761181; 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=YnbP9ozEulH9KamNCIJRKBNiivUy+fJe1VxEC2pv+U8=; b=rhGwXKTDIfatCOxEjrb/YvbjpsAN8xfv+oa5J8/2wx0BmzwjClbH66Q8FDHfxW/+ZLfzZL GdBFAdv4zlbhNkWAY1SKGTm7aYrpSaF9ARWOp/ZXc7FlPN5kv3CIz28SKxxVTdyZe1iKQ6 MShR9nMTbIY+clH7rpqJzXvfPNnuV5MlcrT6hPk2UdTos/d2sKOPboVAdBE/2RCXhvwnKi MmJWLjosACLNaa/Gf1A5iuNfruyv6rEptMvjqh2QEpHvcen7+XO9haeOVMfoKM3Fu1/zcZ GK2RiKLjWwqNKAheyM415x4jUxFROC3Vgql8j3GeH2CzpA1+n5KfQ/eyOdQQfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756761181; 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=YnbP9ozEulH9KamNCIJRKBNiivUy+fJe1VxEC2pv+U8=; b=QM52o8fcf3V5Zm98pcZ9NNoD0X9CCX0maItCENMQ0R0G+4RswstlMK4OXXydevLcGd4h9G CGcG5/ktm+bYGwdOGN2AobV2O2VIA+Uq30Q8rdf+lwEoNuQF3ESCNgBEHGqnb9ZMyFwyRG lmeqWr+2FB+I4kmwzuHy1mLeQ2KlaA2iWWt6Zi6XrT4uzUu9RQduLuP3DN9FDNL3YINM5e Uw07SDRCncKxjP7IseQrl0OhyXobph6TEHIHTzpByHzUf2/ibYImMa+wTJyXNZpieNUyD4 WkRWFOZ8V4YGIvnKSHRbKHWQII+P/bqYF6RiNa9nRK6adMB36FOt+2wM/oZnYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756761181; a=rsa-sha256; cv=none; b=AF4DIxm+cIEzKG18FgUGu8lTqlGO8+M0lnPcQ2m8bVC67vi6zQ0dnJJRpYwHtb7jR3CE2V TrkUyUpTTWRvItTVRcNSNrZPlRq9ANl3TXiYC10UY5jiVGCcFseuOCIU1840HIlEg9pWCj baFvdnrl5Pi0EXzgPkmeKlGugBCaq9vjapryLSM3FmExFGgdq21ocaHcjgIUzUlY5MYQ3a FMj9cQ+vfTVyL3orQgVB4gIHQH+xbMtD4Cu04yDqur86haIpFbhp9jbT06+OAziqh96JB3 OLNFfsiTQTqhHCCtvvW4FYfh7yI04DNF3Vz3wkF8Mc9Z6pm4jvQIg+5MIWTgug== 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 4cG1ms1lJxz2CJ; Mon, 01 Sep 2025 21:13:01 +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 581LD1nO020039; Mon, 1 Sep 2025 21:13:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 581LD1x7020036; Mon, 1 Sep 2025 21:13:01 GMT (envelope-from git) Date: Mon, 1 Sep 2025 21:13:01 GMT Message-Id: <202509012113.581LD1x7020036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 375527545c85 - main - ng_parse: Add upper bound to avoid possible overflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 375527545c85362f14070d35575f9bcd7092f4b9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=375527545c85362f14070d35575f9bcd7092f4b9 commit 375527545c85362f14070d35575f9bcd7092f4b9 Author: Ed Maste AuthorDate: 2025-08-25 14:25:13 +0000 Commit: Ed Maste CommitDate: 2025-09-01 21:12:45 +0000 ng_parse: Add upper bound to avoid possible overflow Also move num initialization for clarity. We still need to check num in ng_unparse_composite (reported by des@ in D52151) but this is another incremental improvement in netgraph input validation. Reviewed by: des PR: 267334 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52151 --- sys/netgraph/ng_parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c index 448ecc92f075..5e1a1bb47ac0 100644 --- a/sys/netgraph/ng_parse.c +++ b/sys/netgraph/ng_parse.c @@ -1199,14 +1199,14 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s, int *off, const u_char *const start, u_char *const buf, int *buflen, const enum comptype ctype) { - const int num = ng_get_composite_len(type, start, buf, ctype); int nextIndex = 0; /* next implicit array index */ u_int index; /* field or element index */ int *foff; /* field value offsets in string */ int align, len, blen, error = 0; /* Initialize */ - if (num < 0) + const int num = ng_get_composite_len(type, start, buf, ctype); + if (num < 0 || num > INT_MAX / sizeof(*foff)) return (EINVAL); foff = malloc(num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO); if (foff == NULL) {