D57171.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57171.diff
View Options

	diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c
	--- a/sys/netlink/netlink_message_parser.c
	+++ b/sys/netlink/netlink_message_parser.c
	@@ -122,6 +122,8 @@
	{
	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
	--- a/sys/netlink/route/iface_drivers.c
	+++ b/sys/netlink/route/iface_drivers.c
	@@ -155,6 +155,9 @@
	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
	--- a/sys/netlink/route/rt.c
	+++ b/sys/netlink/route/rt.c
	@@ -896,6 +896,10 @@
	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];