Re: [PATCH maint] batman-adv: Don't schedule OGM for disabled interface

Re: [PATCH maint] batman-adv: Don't schedule OGM for disabled interface

[Hillf Danton]

On Mon, 17 Feb 2020 22:16:59 +0800 Sven Eckelmann wrote:
> 
> 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>
> 
> I had this one in the pipeline but didn't find the time to correctly test
> it. You already send your one to syzkaller - do you want to rework your one
> (to also catch the broken submission on the same interface) and submit it?
> Or is this patch also ok for you? If it is, do you want to be mentioned in

Your work looks better, thanks :P
And a Cc is more than enough.

Hillf

> some way or form in this patch?
> ---
>  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 5b0b20e6..bd514c36 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 in 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

[PATCH maint] batman-adv: Don't schedule OGM for disabled interface

[Sven Eckelmann]

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>

I had this one in the pipeline but didn't find the time to correctly test
it. You already send your one to syzkaller - do you want to rework your one
(to also catch the broken submission on the same interface) and submit it?
Or is this patch also ok for you? If it is, do you want to be mentioned in
some way or form in this patch?
---
 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 5b0b20e6..bd514c36 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 in 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