summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Lindner <mareklindner@neomailbox.ch>2018-09-07 05:45:54 +0800
committerSimon Wunderlich <sw@simonwunderlich.de>2018-09-07 08:14:26 +0200
commit5af96b9c59c72fb2af2d19c5cc2f3cdcee391dff (patch)
treed592b0145aeacf2904f929d8d5acd07553c23c15
parentae3cdc97dc10c7a3b31f297dab429bfb774c9ccb (diff)
downloadop-kernel-dev-5af96b9c59c72fb2af2d19c5cc2f3cdcee391dff.zip
op-kernel-dev-5af96b9c59c72fb2af2d19c5cc2f3cdcee391dff.tar.gz
batman-adv: fix backbone_gw refcount on queue_work() failure
The backbone_gw 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>
-rw-r--r--net/batman-adv/bridge_loop_avoidance.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index ff9659a..5f1aeed 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1772,6 +1772,7 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb,
{
struct batadv_bla_backbone_gw *backbone_gw;
struct ethhdr *ethhdr;
+ bool ret;
ethhdr = eth_hdr(skb);
@@ -1795,8 +1796,13 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb,
if (unlikely(!backbone_gw))
return true;
- queue_work(batadv_event_workqueue, &backbone_gw->report_work);
- /* backbone_gw is unreferenced in the report work function function */
+ ret = queue_work(batadv_event_workqueue, &backbone_gw->report_work);
+
+ /* backbone_gw is unreferenced in the report work function function
+ * if queue_work() call was successful
+ */
+ if (!ret)
+ batadv_backbone_gw_put(backbone_gw);
return true;
}
OpenPOWER on IntegriCloud