From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sven Eckelmann <sven@narfation.org>,
syzbot+a98f2016f40b9cd3818a@syzkaller.appspotmail.com,
syzbot+ac36b6a33c28a491e929@syzkaller.appspotmail.com,
Hillf Danton <hdanton@sina.com>,
Simon Wunderlich <sw@simonwunderlich.de>,
Sasha Levin <sashal@kernel.org>,
b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.14 03/28] batman-adv: Don't schedule OGM for disabled interface
Date: Wed, 18 Mar 2020 16:55:30 -0400 [thread overview]
Message-ID: <20200318205555.17447-3-sashal@kernel.org> (raw)
In-Reply-To: <20200318205555.17447-1-sashal@kernel.org>
From: Sven Eckelmann <sven@narfation.org>
[ Upstream commit 8e8ce08198de193e3d21d42e96945216e3d9ac7f ]
A transmission scheduling for an interface which is currently dropped by
batadv_iv_ogm_iface_disable could still be in progress. The B.A.T.M.A.N. V
is simply cancelling the workqueue item in an synchronous way but this is
not possible with B.A.T.M.A.N. IV because the OGM submissions are
intertwined.
Instead it has to stop submitting the OGM when it detect that the buffer
pointer is set to NULL.
Reported-by: syzbot+a98f2016f40b9cd3818a@syzkaller.appspotmail.com
Reported-by: syzbot+ac36b6a33c28a491e929@syzkaller.appspotmail.com
Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Cc: Hillf Danton <hdanton@sina.com>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/batman-adv/bat_iv_ogm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 8b3f9441b3a01..5d5e5401a9ea2 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -926,6 +926,10 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
(hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
return;
+ /* interface already disabled by batadv_iv_ogm_iface_disable */
+ if (!*ogm_buff)
+ return;
+
/* the interface gets activated here to avoid race conditions between
* the moment of activating the interface in
* hardif_activate_interface() where the originator mac is set and
--
2.20.1
next prev parent reply other threads:[~2020-03-18 21:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 20:55 [PATCH AUTOSEL 4.14 01/28] cgroup-v1: cgroup_pidlist_next should update position index Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 02/28] cgroup: Iterate tasks that did not finish do_exit() Sasha Levin
2020-03-18 20:55 ` Sasha Levin [this message]
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 04/28] pinctrl: core: Remove extra kref_get which blocks hogs being freed Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 05/28] r8152: check disconnect status after long sleep Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 06/28] bnxt_en: reinitialize IRQs when MTU is modified Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 07/28] cpupower: avoid multiple definition with gcc -fno-common Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 08/28] fib: add missing attribute validation for tun_id Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 09/28] can: add missing attribute validation for termination Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 10/28] macsec: add missing attribute validation for port Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 11/28] team: add missing attribute validation for port ifindex Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 12/28] team: add missing attribute validation for array index Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 13/28] netfilter: cthelper: add missing attribute validation for cthelper Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 14/28] netfilter: nft_payload: add missing attribute validation for payload csum flags Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 15/28] drivers/of/of_mdio.c:fix of_mdiobus_register() Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 16/28] cgroup1: don't call release_agent when it is "" Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 17/28] dt-bindings: net: FMan erratum A050385 Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 18/28] arm64: dts: ls1043a: " Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 19/28] fsl/fman: detect " Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 20/28] virtio-blk: fix hw_queue stopped on arbitrary error Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 21/28] ipvlan: add cond_resched_rcu() while processing muticast backlog Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 22/28] ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast() Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 23/28] scsi: ipr: Fix softlockup when rescanning devices in petitboot Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 24/28] mac80211: Do not send mesh HWMP PREQ if HWMP is disabled Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 25/28] dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 26/28] sxgbe: Fix off by one in samsung driver strncpy size arg Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 27/28] iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.14 28/28] iommu/vt-d: Fix the wrong printing in RHSA parsing 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=20200318205555.17447-3-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=hdanton@sina.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=sven@narfation.org \
--cc=sw@simonwunderlich.de \
--cc=syzbot+a98f2016f40b9cd3818a@syzkaller.appspotmail.com \
--cc=syzbot+ac36b6a33c28a491e929@syzkaller.appspotmail.com \
/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).