FAILED: patch "[PATCH] batman-adv: Don't schedule OGM for disabled interface" failed to apply to 4.4-stable tree

PATCH [email protected] 3 participants 5 messages Mar 16, 2020 – Mar 18, 2020

Subsystems (2)

Stable branch Batman advanced

lore

Share & tools

lore

[email protected]

author maintainer

2020-03-16 13:45 UTC #0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <[email protected]>
Date: Sun, 16 Feb 2020 13:02:06 +0100
Subject: [PATCH] batman-adv: Don't schedule OGM for disabled interface

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 [email protected]

Fixes c6c8fea29769 ("net: Add batman-adv meshing protocol")

Signed-off-by Sven Eckelmann <[email protected]>

Cc Hillf Danton <[email protected]>

Signed-off-by Simon Wunderlich <[email protected]>

net/batman-adv/bat_iv_ogm.c +4 -0

index f0209505e41a..a7c8dd7ae513 100644
@@ -789,6 +789,10 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface)
 
 	lockdep_assert_held(&hard_iface->bat_iv.ogm_buff_mutex);
 
+	/* 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

Sasha Levin

maintainer

2020-03-18 14:17 UTC #1 lore raw

Quoted 26 lines · On Mon, Mar 16, 2020 at 02:45:12PM +0100, [email protected] wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <[email protected]>
Date: Sun, 16 Feb 2020 13:02:06 +0100
Subject: [PATCH] batman-adv: Don't schedule OGM for disabled interface
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.

Quoted 6 lines

Reported-by [email protected]
Reported-by [email protected]
Fixes c6c8fea29769 ("net: Add batman-adv meshing protocol")
Signed-off-by Sven Eckelmann <[email protected]>
Cc Hillf Danton <[email protected]>
Signed-off-by Simon Wunderlich <[email protected]>

Adjusted context and queued up for 4.4.

Signature · 2 lines

Thanks,
Sasha

Sven Eckelmann

maintainer

2020-03-18 14:20 UTC #2 lore raw

Quoted 13 lines · On Wednesday, 18 March 2020 15:17:50 CET Sasha Levin wrote:

Quoted 13 lines
From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <[email protected]>
Date: Sun, 16 Feb 2020 13:02:06 +0100
Subject: [PATCH] batman-adv: Don't schedule OGM for disabled interface
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.

[...]

Quoted 1 line

Adjusted context and queued up for 4.4.

There are most likely patches missing again when you only added this single patch. See the 48 patches I've sent yesterday for batman-adv in 4.4.

Kind regards,
Sven

Greg KH

author maintainer

2020-03-18 14:26 UTC #3 lore raw

Quoted 12 lines · Sven Eckelmann

Quoted 11 lines · On Wednesday, 18 March 2020 15:17:50 CET Sasha Levin wrote:
Quoted 11 lines
From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <[email protected]>
Date: Sun, 16 Feb 2020 13:02:06 +0100
Subject: [PATCH] batman-adv: Don't schedule OGM for disabled interface
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.

Quoted 7 lines

Quoted 2 lines
Quoted 2 lines
Instead it has to stop submitting the OGM when it detect that the buffer pointer is set to NULL.
[...]
Quoted 1 line
Adjusted context and queued up for 4.4.
There are most likely patches missing again when you only added this single patch. See the 48 patches I've sent yesterday for batman-adv in 4.4.

Yeah, I'll queue these all up later on today, thank you for the series.

greg k-h

Sasha Levin

maintainer

2020-03-18 20:54 UTC #4 lore raw

Quoted 15 lines · Greg KH

Quoted 14 lines · Sven Eckelmann
Quoted 13 lines · On Wednesday, 18 March 2020 15:17:50 CET Sasha Levin wrote:
Quoted 13 lines
From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <[email protected]>
Date: Sun, 16 Feb 2020 13:02:06 +0100
Subject: [PATCH] batman-adv: Don't schedule OGM for disabled interface
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.

Quoted 7 lines

Quoted 5 lines
[...]
Quoted 1 line
Adjusted context and queued up for 4.4.
There are most likely patches missing again when you only added this single patch. See the 48 patches I've sent yesterday for batman-adv in 4.4.
Yeah, I'll queue these all up later on today, thank you for the series.

And I've dropped mine, thanks! :)

Signature · 2 lines

Thanks,
Sasha