Skip to content

Commit

Permalink
ieee802154: hwsim: fix rcu handling
Browse files Browse the repository at this point in the history
This patch adds missing rcu_assign_pointer()/rcu_dereference() to used rcu
pointers. There was already a previous commit c5d99d2 ("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: f25da51 ("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>
  • Loading branch information
Alexander Aring authored and David S. Miller committed Aug 9, 2018
1 parent 9c2956d commit 1c9f4a3
Showing 1 changed file with 19 additions and 5 deletions.
24 changes: 19 additions & 5 deletions drivers/net/ieee802154/mac802154_hwsim.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/timer.h>
#include <linux/platform_device.h>
#include <linux/rtnetlink.h>
#include <linux/netdevice.h>
#include <linux/device.h>
#include <linux/spinlock.h>
Expand Down Expand Up @@ -110,7 +111,7 @@ static int hwsim_hw_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
pib->page = page;
pib->channel = channel;

pib_old = phy->pib;
pib_old = rtnl_dereference(phy->pib);
rcu_assign_pointer(phy->pib, pib);
kfree_rcu(pib_old, rcu);
return 0;
Expand Down Expand Up @@ -406,15 +407,21 @@ static struct hwsim_edge *hwsim_alloc_edge(struct hwsim_phy *endpoint, u8 lqi)
}

einfo->lqi = 0xff;
e->info = einfo;
rcu_assign_pointer(e->info, einfo);
e->endpoint = endpoint;

return 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);
}

Expand Down Expand Up @@ -796,7 +803,7 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,
goto err_pib;
}

phy->pib = pib;
rcu_assign_pointer(phy->pib, pib);
phy->idx = idx;
INIT_LIST_HEAD(&phy->edges);

Expand Down Expand Up @@ -829,10 +836,17 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,

static void hwsim_del(struct hwsim_phy *phy)
{
struct hwsim_pib *pib;

hwsim_edge_unsubscribe_me(phy);

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_free_hw(phy->hw);
Expand Down

0 comments on commit 1c9f4a3

Please sign in to comment.