]> err.no Git - linux-2.6/commitdiff
Fix not checked kmalloc() result.
authorPavel Emelyanov <xemul@openvz.org>
Tue, 6 May 2008 14:49:02 +0000 (18:49 +0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 May 2008 01:22:19 +0000 (21:22 -0400)
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 <xemul@openvz.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/mesh_pathtbl.c

index 727aa528c831c28f3b07f943e2f678d98870767b..1d2d051e59765f5de0ce89811a893d5537e0b701 100644 (file)
@@ -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;