lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix GFP_KERNEL allocation under read lock.

Browse Source 
The mesh_path_add() read-locks the pathtbl_resize_lock and calls
kmalloc with GFP_KERNEL mask.

Fix it and move the endadd2 label lower. It should be _before_ the
if() beyond, but it makes no sense for it being there, so I move it
right after this if().

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Emelyanov
2008-05-06 18:46:36 +04:00
committed by John W. Linville
parent 812714d741
commit f84e71a94c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/mesh_pathtbl.c
View File

@@ -158,14 +158,14 @@ int mesh_path_add(u8 *dst, struct net_device *dev)
if (atomic_add_unless(&sdata->u.sta.mpaths, 1, MESH_MAX_MPATHS) == 0) if (atomic_add_unless(&sdata->u.sta.mpaths, 1, MESH_MAX_MPATHS) == 0)
return -ENOSPC; return -ENOSPC;
read_lock(&pathtbl_resize_lock);
new_mpath = kzalloc(sizeof(struct mesh_path), GFP_KERNEL); new_mpath = kzalloc(sizeof(struct mesh_path), GFP_KERNEL);
if (!new_mpath) { if (!new_mpath) {
atomic_dec(&sdata->u.sta.mpaths); atomic_dec(&sdata->u.sta.mpaths);
err = -ENOMEM; err = -ENOMEM;
goto endadd2; goto endadd2;
} }
read_lock(&pathtbl_resize_lock);
memcpy(new_mpath->dst, dst, ETH_ALEN); memcpy(new_mpath->dst, dst, ETH_ALEN);
new_mpath->dev = dev; new_mpath->dev = dev;
new_mpath->flags = 0; new_mpath->flags = 0;
@@ -202,7 +202,6 @@ int mesh_path_add(u8 *dst, struct net_device *dev)
endadd: endadd:
spin_unlock(&mesh_paths->hashwlock[hash_idx]); spin_unlock(&mesh_paths->hashwlock[hash_idx]);
endadd2:
read_unlock(&pathtbl_resize_lock); read_unlock(&pathtbl_resize_lock);
if (!err && grow) { if (!err && grow) {
struct mesh_table *oldtbl, *newtbl; struct mesh_table *oldtbl, *newtbl;
@@ -219,6 +218,7 @@ endadd2:
mesh_table_free(oldtbl, false); mesh_table_free(oldtbl, false);
write_unlock(&pathtbl_resize_lock); write_unlock(&pathtbl_resize_lock);
} }
endadd2:
return err; return err;
} }