From nobody Sat May 23 16:23:18 2026 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 4gN6rk3JP3z6fpdr for ; Sat, 23 May 2026 16:23:18 +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 4gN6rk2c25z437Q for ; Sat, 23 May 2026 16:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779553398; 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=4KarMJoTgDKKEI/hNCY2QvEbq/iM4q4dIVqTdahAzLs=; b=Q5fn1YOxhdqPC5HDCTbot/PpbNDJFl1vz1mNeAJLT+JZ1Vez3eFGYqqV2OQ8jlZSEGJndP ZN6ZSJDX7/U4rCNc+hyxKrSq8uKUp8axSwOIqka/uanAthSkFaQ8QIWWglGR9wmsOSNRU/ kJ+VDItgFs940CypF6zZlnfBiMl3Fr7HA7wVM19dSGW0aOD0rYn6b46D3xQ9iY9yQ+dYZP 3WbtSc+xsV0+BT5343fkfxAjtqQ/xSmPJCz3vbsdt2YyqOOQ8g5yTMUfOMwAoaWx4QT88U POH8V61lm+MKzygnHz2096/8J9VZ/WjWNmFeAd0pbmq+/H5j/fh43msOWUmyNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779553398; a=rsa-sha256; cv=none; b=xIIufbV2AmEXdtGEU/H1d2aLqcRN3acMgcC3N69ZOnVqvtiB/Pzq0/Jjb9rqjK3dWEUp9S 4nrrf6kUzLX7zVBROmRNmu0BhNGg+Z8I8YuKIR1+R8r972uzTYF1Qp6kR3XQKnKfMiLOef ogBBcQP1Pad6hNti3YMC0cLvmA85CEMiTrRkwyI7u5Fvdb7IPa4wmeedIg0sMERf0h6STO XgUI4qKCxWWP6pqF+sC0XaokV8JqUS5GN1WKtjF4r2Mxt6A00kAesy89+Pd1LjQPDvAcG9 QCLzK9O3/+wQbef5HecqOKWFJSO9eJ0JMcLrDGOso5I1ng69JVD3rW9ljnDDzA== 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=1779553398; 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=4KarMJoTgDKKEI/hNCY2QvEbq/iM4q4dIVqTdahAzLs=; b=acH3xEB/vDg7kVKs9qqE0VY+6tXW2iU3q6KLX6seci5gRgCtWXbNTkDgbGxPX7CmZLpwRt /c0RlfSA/WMBqly6GdFzRcxHeQKqTlJMY9O6/WVXVTL3xaxcUhnSwLlcDlfDhwvZD8mWGu XqzN+srEhrBsvnVNWK8WojffhErRcJR8wzAJ5Lnop0XDMRg51bDfY9EgUa3ebrUScRy3DV E1WpRPPMHd2TLlvpBEb7KGGUoexwf+Uhycg+rh4qYer6+RubRn5hAG00GgE9AFDGzU3PxE +RC5rK6JII416fkh+vIDBWAsaleUNvcv9tUHiB6uQIq6aDPGg1GVqVwhXYqvhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gN6rk1ZKHzkl for ; Sat, 23 May 2026 16:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31313 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 23 May 2026 16:23:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 1dbc10414884 - main - netlink: Check for NULL return from npt_alloc() 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 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/main X-Git-Reftype: branch X-Git-Commit: 1dbc104148845434575d1931d47876ae0ca1542f Auto-Submitted: auto-generated Date: Sat, 23 May 2026 16:23:18 +0000 Message-Id: <6a11d476.31313.25b20a45@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1dbc104148845434575d1931d47876ae0ca1542f commit 1dbc104148845434575d1931d47876ae0ca1542f Author: Ed Maste AuthorDate: 2026-05-22 14:41:16 +0000 Commit: Ed Maste CommitDate: 2026-05-23 16:22:36 +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 --- 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 54aceb660a98..65de7cc645a0 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -122,6 +122,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 09717c976021..8159409c9f67 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -896,6 +896,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];