From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Marek Lindner <mareklindner@neomailbox.ch>,
Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [B.A.T.M.A.N.] [PATCH 09/11] batman-adv: fix backbone_gw refcount on queue_work() failure
Date: Wed, 19 Sep 2018 14:22:11 +0200 [thread overview]
Message-ID: <20180919122213.23108-10-sw@simonwunderlich.de> (raw)
In-Reply-To: <20180919122213.23108-1-sw@simonwunderlich.de>
From: Marek Lindner <mareklindner@neomailbox.ch>
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>
---
net/batman-adv/bridge_loop_avoidance.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index ff9659af6b91..5f1aeeded0e3 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;
}
--
2.11.0
next prev parent reply other threads:[~2018-09-19 12:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 12:22 [B.A.T.M.A.N.] [PATCH 00/11] pull request for net: batman-adv 2018-09-19 Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 01/11] batman-adv: Avoid probe ELP information leak Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 02/11] batman-adv: Fix segfault when writing to throughput_override Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 03/11] batman-adv: Fix segfault when writing to sysfs elp_interval Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 04/11] batman-adv: Prevent duplicated gateway_node entry Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 05/11] batman-adv: Prevent duplicated nc_node entry Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 06/11] batman-adv: Prevent duplicated softif_vlan entry Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 07/11] batman-adv: Prevent duplicated global TT entry Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 08/11] batman-adv: Prevent duplicated tvlv handler Simon Wunderlich
2018-09-19 12:22 ` Simon Wunderlich [this message]
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 10/11] batman-adv: fix hardif_neigh refcount on queue_work() failure Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 11/11] batman-adv: Increase version number to 2018.3 Simon Wunderlich
2018-09-20 3:34 ` [B.A.T.M.A.N.] [PATCH 00/11] pull request for net: batman-adv 2018-09-19 David Miller
2018-09-20 8:09 ` Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180919122213.23108-10-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=mareklindner@neomailbox.ch \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).