Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95743deb authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

[DECNET]: Handle a failure in neigh_parms_alloc (take 2) 



While enhancing the neighbour code to handle multiple network
namespaces I noticed that decnet is assuming neigh_parms_alloc
will allways succeed, which is clearly wrong.  So handle the
failure.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Acked-by: default avatarSteven Whitehouse <steve@chygwyn.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24cb230b

net/decnet/dn_dev.c

+9 −2
Original line number Diff line number Diff line
@@ -1145,16 +1145,23 @@ struct dn_dev *dn_dev_create(struct net_device *dev, int *err) 
	init_timer(&dn_db->timer);



	dn_db->uptime = jiffies;



	dn_db->neigh_parms = neigh_parms_alloc(dev, &dn_neigh_table);

	if (!dn_db->neigh_parms) {

		dev->dn_ptr = NULL;

		kfree(dn_db);

		return NULL;

	}



	if (dn_db->parms.up) {

		if (dn_db->parms.up(dev) < 0) {

			neigh_parms_release(&dn_neigh_table, dn_db->neigh_parms);

			dev->dn_ptr = NULL;

			kfree(dn_db);

			return NULL;

		}

	}



	dn_db->neigh_parms = neigh_parms_alloc(dev, &dn_neigh_table);



	dn_dev_sysctl_register(dev, &dn_db->parms);



	dn_dev_set_timer(dev);