Return-path: Received: from sacred.ru ([62.205.161.221]:46638 "EHLO sacred.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756533AbYEGPvC (ORCPT ); Wed, 7 May 2008 11:51:02 -0400 Message-ID: <4821CF3E.1050301@openvz.org> (sfid-20080507_175011_254544_CE19B743) Date: Wed, 07 May 2008 19:48:14 +0400 From: Pavel Emelyanov MIME-Version: 1.0 To: Johannes Berg , "John W. Linville" CC: linux-wireless@vger.kernel.org, Linux Netdev List Subject: [PATCH 3/7][MAC80211]: Report allocation failure from mesh_path_node_copy. Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: Now - return the -ENOMEM in case kmalloc fails. Signed-off-by: Pavel Emelyanov --- net/mac80211/mesh_pathtbl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 512bfa1..fe1ceee 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, -- 1.5.3.4