From nobody Tue Jun 9 14:09:41 2026 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 4gZW4k1l9tz6g3Dn for ; Tue, 09 Jun 2026 14:09: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZW4j5zvXz3tcM for ; Tue, 09 Jun 2026 14:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781014181; 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=buRykqkRMT09mU1Wsx1juOXnat2YpPZlVkvFex0TrsI=; b=K2PajZkFsiCiaB1e4+bcqhyu2tFEyH8hZLUFWOapJnubXgyI5u1txhlFYE9VCR6RzQRdhy /S78YtrEAUAGJFE51HtUySQCG3OyHmP/IC/WRWV4Voskd0aV7j9NLhrDidAHqlyYUXSJdC mUv2WZfHHxA2UL8dlVPIFwWA5gE4NpfYBZeu86TuYGv9K3mWclzMPdVqMt/hXdqMxFIF+D dtDUju5xXVYkHCR2YrmJti/vJtRTpLmvzeAkwxman7Dw455WLVmVJX77IiARgOUNxaawWT fDASLOqTcDRLcvLkvnmR7EzfhfzCG9NL9tKRmVf7bIZuR3628j5sg0Q5dcG7Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781014181; a=rsa-sha256; cv=none; b=Jq1O+EcdBKuUoai/Ievu4wiRcFnXC1YngC96e8ElJpHmK1uEsisXGyAIrKPnKCQzMklt8a 4I2tyfZEpkA/gygmURlFyTryVo9dPcfoNoRTc3cCK3E/FLkZmXH6RaXiROcPkjOEOaSwyZ +K3vVHPLZJ+YnPbUeY6F1XKObHKAZJVkus/rLLZgWOZhGi2fKG7FDATGlS28QoObKWHn8l aYGUAo1Wb0jvLOcR+9UtLQmwziq6U+4dm5Z86sqd7rQJxLSsKvGXKMv11Aq3GqH0HU3SQe 37/T93+r3VyTEjR1KIhdUCM6L95tLzKdy8AbP92VQ79FNQjAgX/bxtrPEU4jDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781014181; 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=buRykqkRMT09mU1Wsx1juOXnat2YpPZlVkvFex0TrsI=; b=bDCCktSKxtK2NrZYGkaLD6tHV1uQBQt1EIamL62vYhWdKaaWgy061QCBPswGtaldWZsr2g u0IaoNA9ebUsh2OKSBbBBZHAjPJHkSv58s52SGe6CNDTPacppyEv4ZQ+9kqkganmHp1gbK cdVmzmS7mJocU3gW4KX2Mz9bQKCnmE7extkaFCPbTG+ZhIQFmkoDtU5Q+nFq8+PO68kJ7Z RucjLGukhzUKZW+nr3iT0nq/9ifiWTNo/hwprY2cJdY2j47bxkmW/OhmjTPyC1OB+et7v/ 18i41ATea2XqzObNh2y19h2iaw7S8WoBv5Hg9y6avmpXdVcIEAH543Z+FYAUMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZW4j5SNHzf17 for ; Tue, 09 Jun 2026 14:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44650 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 14:09:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e22716b6cbfc - stable/15 - netlink: Check for NULL return from npt_alloc() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: e22716b6cbfcb4c9ff1900f19c923fb84aebcae1 Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 14:09:41 +0000 Message-Id: <6a281ea5.44650.66ad1466@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e22716b6cbfcb4c9ff1900f19c923fb84aebcae1 commit e22716b6cbfcb4c9ff1900f19c923fb84aebcae1 Author: Ed Maste AuthorDate: 2026-05-22 14:41:16 +0000 Commit: Ed Maste CommitDate: 2026-06-09 13:40:29 +0000 netlink: Check for NULL return from npt_alloc() Reviewed by: glebius, pouria Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57171 (cherry picked from commit 1dbc104148845434575d1931d47876ae0ca1542f) --- sys/netlink/netlink_message_parser.c | 2 ++ sys/netlink/route/iface_drivers.c | 3 +++ sys/netlink/route/rt.c | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c index 4c41235efaac..37c16ce3024f 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -90,6 +90,8 @@ nlmsg_report_cookie_u32(struct nl_pstate *npt, uint32_t val) { struct nlattr *nla = npt_alloc(npt, sizeof(*nla) + sizeof(uint32_t)); + if (nla == NULL) + return; nla->nla_type = NLMSGERR_ATTR_COOKIE; nla->nla_len = sizeof(*nla) + sizeof(uint32_t); memcpy(nla + 1, &val, sizeof(uint32_t)); diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 4f1540740ead..31d2523a479b 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -155,6 +155,9 @@ _nl_store_ifp_cookie(struct nl_pstate *npt, struct ifnet *ifp) sizeof(ifindex) + NL_ITEM_ALIGN(ifname_len + 1); struct nlattr *nla_cookie = npt_alloc(npt, nla_len); + if (nla_cookie == NULL) + return; + /* Nested TLV */ nla_cookie->nla_len = nla_len; nla_cookie->nla_type = NLMSGERR_ATTR_COOKIE; diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index a76e00d34502..42ba3307b816 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -868,6 +868,10 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, int num_nhops = attrs->rta_multipath->num_nhops; struct weightened_nhop *wn = npt_alloc(npt, sizeof(*wn) * num_nhops); + if (wn == NULL) { + *perror = ENOMEM; + return (NULL); + } for (int i = 0; i < num_nhops; i++) { struct rta_mpath_nh *mpnh = &attrs->rta_multipath->nhops[i];