Commit dafe2078 authored Jun 01, 2020 by Patrick Eigensatz Committed by David S. Miller Jun 01, 2020

ipv4: nexthop: Fix deadcode issue by performing a proper NULL check



After allocating the spare nexthop group it should be tested for kzalloc()
returning NULL, instead the already used nexthop group (which cannot be
NULL at this point) had been tested so far.

Additionally, if kzalloc() fails, return ERR_PTR(-ENOMEM) instead of NULL.

Coverity-id: 1463885
Reported-by: Coverity <scan-admin@coverity.com>
Signed-off-by: Patrick Eigensatz <patrickeigensatz@gmail.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 07f6ecec

net/ipv4/nexthop.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1185,10 +1185,10 @@ static struct nexthop nexthop_create_group(struct net net,

		/* spare group used for removals */
		nhg->spare = nexthop_grp_alloc(num_nh);
		if (!nhg) {
		if (!nhg->spare) {
		kfree(nhg);
		kfree(nh);
		return NULL;
		return ERR_PTR(-ENOMEM);
		}
		nhg->spare->spare = nhg;

Admin message