From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Marek Lindner <mareklindner@neomailbox.ch>,
Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>,
Sasha Levin <alexander.levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.14 10/32] batman-adv: fix backbone_gw refcount on queue_work() failure
Date: Mon, 8 Oct 2018 11:26:07 -0400 [thread overview]
Message-ID: <20181008152629.70812-10-sashal@kernel.org> (raw)
In-Reply-To: <20181008152629.70812-1-sashal@kernel.org>
From: Marek Lindner <mareklindner@neomailbox.ch>
[ Upstream commit 5af96b9c59c72fb2af2d19c5cc2f3cdcee391dff ]
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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
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 422ee16b7854..c3c848f64fdd 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.17.1
next prev parent reply other threads:[~2018-10-08 15:33 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 15:25 [PATCH AUTOSEL 4.14 01/32] media: af9035: prevent buffer overflow on write Sasha Levin
2018-10-08 15:25 ` [PATCH AUTOSEL 4.14 02/32] batman-adv: Avoid probe ELP information leak Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 03/32] batman-adv: Fix segfault when writing to throughput_override Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 04/32] batman-adv: Fix segfault when writing to sysfs elp_interval Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 05/32] batman-adv: Prevent duplicated gateway_node entry Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 06/32] batman-adv: Prevent duplicated nc_node entry Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 07/32] batman-adv: Prevent duplicated softif_vlan entry Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 08/32] batman-adv: Prevent duplicated global TT entry Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 09/32] batman-adv: Prevent duplicated tvlv handler Sasha Levin
2018-10-08 15:26 ` Sasha Levin [this message]
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 11/32] batman-adv: fix hardif_neigh refcount on queue_work() failure Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 12/32] clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 13/32] ucma: fix a use-after-free in ucma_resolve_ip() Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 14/32] scsi: ibmvscsis: Fix a stringop-overflow warning Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 15/32] scsi: ibmvscsis: Ensure partition name is properly NUL terminated Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 16/32] intel_th: pci: Add Ice Lake PCH support Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 17/32] Input: atakbd - fix Atari keymap Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 18/32] Input: atakbd - fix Atari CapsLock behaviour Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 19/32] net: emac: fix fixed-link setup for the RTL8363SB switch Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 20/32] ravb: do not write 1 to reserved bits Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 21/32] bnxt_en: don't try to offload VLAN 'modify' action Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 22/32] PCI: dwc: Fix scheduling while atomic issues Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 23/32] drm: mali-dp: Call drm_crtc_vblank_reset on device init Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 24/32] scsi: ipr: System hung while dlpar adding primary ipr adapter back Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 25/32] scsi: sd: don't crash the host on invalid commands Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 26/32] net/mlx4: Use cpumask_available for eq->affinity_mask Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 27/32] clocksource/drivers/fttmr010: Fix set_next_event handler Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 28/32] net: aquantia: memory corruption on jumbo frames Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 29/32] RISC-V: include linux/ftrace.h in asm-prototypes.h Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 30/32] powerpc/tm: Fix userspace r13 corruption Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 31/32] powerpc/tm: Avoid possible userspace r1 corruption on reclaim Sasha Levin
2018-10-08 15:26 ` [PATCH AUTOSEL 4.14 32/32] iommu/amd: Return devid as alias for ACPI HID devices Sasha Levin
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=20181008152629.70812-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alexander.levin@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mareklindner@neomailbox.ch \
--cc=stable@vger.kernel.org \
--cc=sven@narfation.org \
--cc=sw@simonwunderlich.de \
/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