From: Sven Eckelmann <sven@narfation.org>
To: stable@vger.kernel.org
Cc: b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven@narfation.org>,
Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
syzbot+c0b807de416427ff3dd1@syzkaller.appspotmail.com,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [PATCH 4.4 11/11] batman-adv: Avoid WARN_ON timing related checks
Date: Sat, 20 Nov 2021 13:39:39 +0100 [thread overview]
Message-ID: <20211120123939.260723-12-sven@narfation.org> (raw)
In-Reply-To: <20211120123939.260723-1-sven@narfation.org>
commit 9f460ae31c4435fd022c443a6029352217a16ac1 upstream.
The soft/batadv interface for a queued OGM can be changed during the time
the OGM was queued for transmission and when the OGM is actually
transmitted by the worker.
But WARN_ON must be used to denote kernel bugs and not to print simple
warnings. A warning can simply be printed using pr_warn.
Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Reported-by: syzbot+c0b807de416427ff3dd1@syzkaller.appspotmail.com
Fixes: ef0a937f7a14 ("batman-adv: consider outgoing interface in OGM sending")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
[ bp: 4.4 backported: adjust context. ]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
net/batman-adv/bat_iv_ogm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index caea5bb38d4b..6f8d2fe114f6 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -526,8 +526,10 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet)
if (WARN_ON(!forw_packet->if_outgoing))
goto out;
- if (WARN_ON(forw_packet->if_outgoing->soft_iface != soft_iface))
+ if (forw_packet->if_outgoing->soft_iface != soft_iface) {
+ pr_warn("%s: soft interface switch for queued OGM\n", __func__);
goto out;
+ }
if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE)
goto out;
--
2.30.2
next prev parent reply other threads:[~2021-11-20 12:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-20 12:39 [PATCH 4.4 00/11] batman-adv: Fixes for stable/linux-4.4.y Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 01/11] batman-adv: Keep fragments equally sized Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 02/11] batman-adv: Fix multicast TT issues with bogus ROAM flags Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 03/11] batman-adv: Prevent duplicated softif_vlan entry Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 04/11] batman-adv: mcast: fix duplicate mcast packets in BLA backbone from LAN Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 05/11] batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 06/11] batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 07/11] batman-adv: set .owner to THIS_MODULE Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 08/11] batman-adv: Consider fragmentation for needed_headroom Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 09/11] batman-adv: Reserve needed_*room for fragments Sven Eckelmann
2021-11-20 12:39 ` [PATCH 4.4 10/11] batman-adv: Don't always reallocate the fragmentation skb head Sven Eckelmann
2021-11-20 12:39 ` Sven Eckelmann [this message]
2021-11-23 12:41 ` [PATCH 4.4 00/11] batman-adv: Fixes for stable/linux-4.4.y Greg KH
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=20211120123939.260723-12-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=stable@vger.kernel.org \
--cc=sw@simonwunderlich.de \
--cc=syzbot+c0b807de416427ff3dd1@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).