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: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
committed by
Adrian Bunk
parent
b3d6856755
commit
50c6a34d4d
+9
-2
@@ -1117,16 +1117,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);
|
||||
|
||||
Reference in New Issue
Block a user