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

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

[gregkh]

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 <stable@vger.kernel.org>.

thanks,

greg k-h

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

From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven@narfation.org>
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: 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>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index f0209505e41a..a7c8dd7ae513 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -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

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

[Sasha Levin]

On Mon, Mar 16, 2020 at 02:45:12PM +0100, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
>From: Sven Eckelmann <sven@narfation.org>
>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: 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>

Adjusted context and queued up for 4.4.

-- 
Thanks,
Sasha

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

[Sven Eckelmann]

[-- Attachment #1: Type: text/plain, Size: 936 bytes --]

On Wednesday, 18 March 2020 15:17:50 CET Sasha Levin wrote:
> >From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
> >From: Sven Eckelmann <sven@narfation.org>
> >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.
[...]
> 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

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Greg KH]

On Wed, Mar 18, 2020 at 03:20:11PM +0100, Sven Eckelmann wrote:
> On Wednesday, 18 March 2020 15:17:50 CET Sasha Levin wrote:
> > >From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
> > >From: Sven Eckelmann <sven@narfation.org>
> > >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.
> [...]
> > 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

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

[Sasha Levin]

On Wed, Mar 18, 2020 at 03:26:52PM +0100, Greg KH wrote:
>On Wed, Mar 18, 2020 at 03:20:11PM +0100, Sven Eckelmann wrote:
>> On Wednesday, 18 March 2020 15:17:50 CET Sasha Levin wrote:
>> > >From 8e8ce08198de193e3d21d42e96945216e3d9ac7f Mon Sep 17 00:00:00 2001
>> > >From: Sven Eckelmann <sven@narfation.org>
>> > >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.
>> [...]
>> > 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! :)

-- 
Thanks,
Sasha