niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

ieee802154: hwsim: fix rcu handling

Browse source 
This patch adds missing rcu_assign_pointer()/rcu_dereference() to used rcu
pointers. There was already a previous commit c5d99d2b35 ("ieee802154:
hwsim: fix rcu address annotation"), but there was more which was
pointed out on my side by using newest sparse version.

Cc: Stefan Schmidt <stefan@datenfreihafen.org>
Fixes: f25da51fdc ("ieee802154: hwsim: add replacement for fakelb")
Signed-off-by: Alexander Aring <aring@mojatatu.com>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Aring 2018-08-07 19:32:49 -04:00 • committed by David S. Miller
parent 9c2956d2ad
commit 1c9f4a3fce
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/net/ieee802154/mac802154_hwsim.c
View file

@ -22,6 +22,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/rtnetlink.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
@ -110,7 +111,7 @@ static int hwsim_hw_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
pib->page = page; pib->page = page;
pib->channel = channel; pib->channel = channel;
pib_old = phy->pib; pib_old = rtnl_dereference(phy->pib);
rcu_assign_pointer(phy->pib, pib); rcu_assign_pointer(phy->pib, pib);
kfree_rcu(pib_old, rcu); kfree_rcu(pib_old, rcu);
return 0; return 0;
@ -406,7 +407,7 @@ static struct hwsim_edge *hwsim_alloc_edge(struct hwsim_phy *endpoint, u8 lqi)
} }
einfo->lqi = 0xff; einfo->lqi = 0xff;
e->info = einfo; rcu_assign_pointer(e->info, einfo);
e->endpoint = endpoint; e->endpoint = endpoint;
return e; return e;
@ -414,7 +415,13 @@ static struct hwsim_edge *hwsim_alloc_edge(struct hwsim_phy *endpoint, u8 lqi)
static void hwsim_free_edge(struct hwsim_edge *e) static void hwsim_free_edge(struct hwsim_edge *e)
{ {
kfree_rcu(e->info, rcu); struct hwsim_edge_info *einfo;
rcu_read_lock();
einfo = rcu_dereference(e->info);
rcu_read_unlock();
kfree_rcu(einfo, rcu);
kfree_rcu(e, rcu); kfree_rcu(e, rcu);
} }
@ -796,7 +803,7 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,
goto err_pib; goto err_pib;
} }
phy->pib = pib; rcu_assign_pointer(phy->pib, pib);
phy->idx = idx; phy->idx = idx;
INIT_LIST_HEAD(&phy->edges); INIT_LIST_HEAD(&phy->edges);
@ -829,10 +836,17 @@ err_pib:
static void hwsim_del(struct hwsim_phy *phy) static void hwsim_del(struct hwsim_phy *phy)
{ {
struct hwsim_pib *pib;
hwsim_edge_unsubscribe_me(phy); hwsim_edge_unsubscribe_me(phy);
list_del(&phy->list); list_del(&phy->list);
kfree_rcu(phy->pib, rcu);
rcu_read_lock();
pib = rcu_dereference(phy->pib);
rcu_read_unlock();
kfree_rcu(pib, rcu);
ieee802154_unregister_hw(phy->hw); ieee802154_unregister_hw(phy->hw);
ieee802154_free_hw(phy->hw); ieee802154_free_hw(phy->hw);