From: Pavel Emelyanov Date: Wed, 7 May 2008 15:48:14 +0000 (+0400) Subject: mac80211: Report allocation failure from mesh_path_node_copy. X-Git-Tag: v2.6.27-rc1~969^2~337^2~121 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=00242c40a167113688dd7ed46ec94e8a4c47f603;p=linux-2.6-omap-h63xx.git mac80211: Report allocation failure from mesh_path_node_copy. Now - return the -ENOMEM in case kmalloc fails. Signed-off-by: Pavel Emelyanov Signed-off-by: John W. Linville --- diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 512bfa112c6..fe1ceeea07f 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c @@ -469,9 +469,12 @@ static int mesh_path_node_copy(struct hlist_node *p, struct mesh_table *newtbl) struct mpath_node *node, *new_node; u32 hash_idx; + new_node = kmalloc(sizeof(struct mpath_node), GFP_KERNEL); + if (new_node == NULL) + return -ENOMEM; + node = hlist_entry(p, struct mpath_node, list); mpath = node->mpath; - new_node = kmalloc(sizeof(struct mpath_node), GFP_KERNEL); new_node->mpath = mpath; hash_idx = mesh_table_hash(mpath->dst, mpath->dev, newtbl); hlist_add_head(&new_node->list,