From nobody Thu Sep 4 13:05:41 2025 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 4cHfqB0LW5z65yV2; Thu, 04 Sep 2025 13:05:42 +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 4cHfq96qh1z3N10; Thu, 04 Sep 2025 13:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756991142; 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=1XkpZrnkg+bNnGCkFQafbsH+A56AVOhMsoNSjRYG0oY=; b=vmIB6M3qVm5Mf/L53T8k7Grj+Drmdm87qaRXevcAQDZjhORNj4zJc9a5s8D/T9BhtpMVGF MoCjjLVzOKbNcvOcWq+IezKmzYIz1VneRfZRaZs/pAW+u9bWjqvYCiFKKP5T/IOU0dhjKG NJQEKILVvTM3gVakhCM21+U4pBMxyloh6DeqbqBLedSYQSQBa/AzdVli/Pz4Wt5m+Mhy1R eAw2CIes+yoQf8ipK/qrFQIJOdwYK3nWKlyPv3xfRbhn4i7oo0tGl1d1cj8oQRDLuL8UO7 hFFxQSliZqqPghcCGezSTimIs+3rLLBBrE7Q+/ZL7UrdaM9RJ2Ec6rFuqW8Wsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756991142; 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=1XkpZrnkg+bNnGCkFQafbsH+A56AVOhMsoNSjRYG0oY=; b=aV7rsK9pAZH5o74VvdxdotD4x9UGrt092rL1XDd47DecBccH4rjq7nUu/mcUNhxBguPUUh +FqVCI/kvqLj6c/bWESlkNx5sL5RGNMoLDvusUPmX36G84eU107YFaf82g/5f3tG+h022k RNxxGxOSPmv/8z+LB+IJvdZIH8f/iMWTkSEzJannayUPJp7ZXk0kj/lJIld87AzzvVumax 8oV+OxdIOcWVR3eVN6Q6ZnFJyD6OcY0as6NlusmDwlukrfyG7Nag9nfHQUwZmcLPNR7r+f 4FAC1EuHS5L1hPexoez5HB4HVX2elHR08LfYbfUnpVt0att+T1OOJZWt289iHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756991142; a=rsa-sha256; cv=none; b=DMJn6J+jn7JMar59vyx1fGg+D08tCL9L9YkM2t9lQFBEub/tl/+0LzdTQ2aM1+xapbGXCw 7APq5O/K2kYlKX5Onms0OEZTpOyHRqQX0pH2aOoct+/+uRkKbrE86PhyH6fjqYK3M0f9rv 6ZRqiMuWVpmx8b7mWe5h16PlHiBqupKn92SnRr/F9Iit3kcnDgjNUSZji8dsxoGbplcTvL psQieQ904oWrR4T2dyYsiSJBoLiFWkoNKKg+0WAOKg1Oi6BJDJ2eawp21fQwNF8ScSGCcb j4HZEEs73Bw8Hn23tgJ1RhkXTOHVm8wk2eTJFRskl/+RRSJYA5+M6v49dGcNjQ== 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 4cHfq96P1Vz13ZM; Thu, 04 Sep 2025 13:05:41 +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 584D5faT055834; Thu, 4 Sep 2025 13:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584D5f5H055831; Thu, 4 Sep 2025 13:05:41 GMT (envelope-from git) Date: Thu, 4 Sep 2025 13:05:41 GMT Message-Id: <202509041305.584D5f5H055831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: bc77917cd053 - stable/13 - ng_parse: disallow negative length for malloc 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: bc77917cd053f5ce3d8b5e9ad6b64bad69a7bd06 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bc77917cd053f5ce3d8b5e9ad6b64bad69a7bd06 commit bc77917cd053f5ce3d8b5e9ad6b64bad69a7bd06 Author: Ed Maste AuthorDate: 2022-11-01 14:01:29 +0000 Commit: Ed Maste CommitDate: 2025-09-04 13:05:30 +0000 ng_parse: disallow negative length for malloc This is an interim robustness improvement; further improvements as described in the PR and/or Phabricator review are still needed. PR: 267334 Reported by: Robert Morris Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37229 (cherry picked from commit ae4f39464c61182c2bdfd3cc61594f8707b3daf0) (cherry picked from commit 0e0329c6dbabc12f5ab08bb63929a2ba6d506084) --- sys/netgraph/ng_parse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c index e11070274484..1a1d9d8b3064 100644 --- a/sys/netgraph/ng_parse.c +++ b/sys/netgraph/ng_parse.c @@ -1207,6 +1207,8 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s, int align, len, blen, error = 0; /* Initialize */ + if (num < 0) + return (EINVAL); foff = malloc(num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO); if (foff == NULL) { error = ENOMEM;