diff options
| author | Marek Lindner <mareklindner@neomailbox.ch> | 2018-09-07 05:45:55 +0800 |
|---|---|---|
| committer | Simon Wunderlich <sw@simonwunderlich.de> | 2018-09-07 08:14:26 +0200 |
| commit | 4c4af6900844ab04c9434c972021d7b48610e06a (patch) | |
| tree | 29a6de6b545080cd75b59576be49320c91cef869 /net | |
| parent | 5af96b9c59c72fb2af2d19c5cc2f3cdcee391dff (diff) | |
| download | linux-stable-4c4af6900844ab04c9434c972021d7b48610e06a.tar.gz linux-stable-4c4af6900844ab04c9434c972021d7b48610e06a.tar.bz2 linux-stable-4c4af6900844ab04c9434c972021d7b48610e06a.zip | |
batman-adv: fix hardif_neigh refcount on queue_work() failure
The hardif_neigh refcounter is to be decreased by the queued work and
currently is never decreased if the queue_work() call fails.
Fix by checking the queue_work() return value and decrease refcount
if necessary.
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/bat_v_elp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index e103c759b7ab..9f481cfdf77d 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -268,6 +268,7 @@ static void batadv_v_elp_periodic_work(struct work_struct *work) struct batadv_priv *bat_priv; struct sk_buff *skb; u32 elp_interval; + bool ret; bat_v = container_of(work, struct batadv_hard_iface_bat_v, elp_wq.work); hard_iface = container_of(bat_v, struct batadv_hard_iface, bat_v); @@ -329,8 +330,11 @@ static void batadv_v_elp_periodic_work(struct work_struct *work) * may sleep and that is not allowed in an rcu protected * context. Therefore schedule a task for that. */ - queue_work(batadv_event_workqueue, - &hardif_neigh->bat_v.metric_work); + ret = queue_work(batadv_event_workqueue, + &hardif_neigh->bat_v.metric_work); + + if (!ret) + batadv_hardif_neigh_put(hardif_neigh); } rcu_read_unlock(); |