Skip to contentSkip to conversation

: Fix not checked kmalloc() result.

PATCH In review Pavel Emelyanov 1 participant 1 message May 6, 2008

Subsystems (3)
Networking Network drivers mac80211
lore
Share & tools
lore

Pavel Emelyanov

author
#0 lore raw

PATCH 2/4 : Fix not checked kmalloc() result.

The new_node kmallocation is not checked for success, so add this check.

BTW, it also happens under the read_lock.

Signed-off-by Pavel Emelyanov <[email protected]>
---
 net/mac80211/mesh_pathtbl.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
net/mac80211/mesh_pathtbl.c +7 -1
index 727aa52..1d2d051 100644
@@ -164,13 +164,19 @@ int mesh_path_add(u8 *dst, struct net_device *dev)
 		err = -ENOMEM;
 		goto endadd2;
 	}
+	new_node = kmalloc(sizeof(struct mpath_node), GFP_KERNEL);
+	if (!new_node) {
+		kfree(new_mpath);
+		atomic_dec(&sdata->u.sta.mpaths);
+		err = -ENOMEM;
+		goto endadd2;
+	}
 
 	read_lock(&pathtbl_resize_lock);
 	memcpy(new_mpath->dst, dst, ETH_ALEN);
 	new_mpath->dev = dev;
 	new_mpath->flags = 0;
 	skb_queue_head_init(&new_mpath->frame_queue);
-	new_node = kmalloc(sizeof(struct mpath_node), GFP_KERNEL);
 	new_node->mpath = new_mpath;
 	new_mpath->timer.data = (unsigned long) new_mpath;
 	new_mpath->timer.function = mesh_path_timer;
Signature · 1 line
1.5.3.4