From: Sasha Levin Date: Mon, 30 Mar 2020 12:38:14 +0000 (-0400) Subject: Drop batman-adv-don-t-schedule-ogm-for-disabled-interface.patch X-Git-Tag: v5.6.1~48^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7eccfc1e64736ca46d60ba82f6804d596970b755;p=thirdparty%2Fkernel%2Fstable-queue.git Drop batman-adv-don-t-schedule-ogm-for-disabled-interface.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/batman-adv-don-t-schedule-ogm-for-disabled-interface.patch b/queue-4.14/batman-adv-don-t-schedule-ogm-for-disabled-interface.patch deleted file mode 100644 index b454b91ee3c..00000000000 --- a/queue-4.14/batman-adv-don-t-schedule-ogm-for-disabled-interface.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 797216472830f43a460eda1ff7ce23ba802e75ff Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 16 Feb 2020 13:02:06 +0100 -Subject: batman-adv: Don't schedule OGM for disabled interface - -From: Sven Eckelmann - -[ 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 -Cc: Hillf Danton -Signed-off-by: Simon Wunderlich -Signed-off-by: Sasha Levin ---- - 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 7a723e124dbb5..e6acd36f83a41 100644 ---- a/net/batman-adv/bat_iv_ogm.c -+++ b/net/batman-adv/bat_iv_ogm.c -@@ -961,6 +961,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; -+ - /* interface already disabled by batadv_iv_ogm_iface_disable */ - if (!*ogm_buff) - return; --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index fb9452300ca..f8489e10496 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -72,7 +72,6 @@ hsr-add-restart-routine-into-hsr_get_node_list.patch hsr-set-.netnsok-flag.patch net-ipv4-don-t-let-pmtu-updates-increase-route-mtu.patch cgroup-v1-cgroup_pidlist_next-should-update-position.patch -batman-adv-don-t-schedule-ogm-for-disabled-interface.patch cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch drivers-of-of_mdio.c-fix-of_mdiobus_register.patch cgroup1-don-t-call-release_agent-when-it-is.patch diff --git a/queue-4.9/batman-adv-don-t-schedule-ogm-for-disabled-interface.patch b/queue-4.9/batman-adv-don-t-schedule-ogm-for-disabled-interface.patch deleted file mode 100644 index dbd703d5e2b..00000000000 --- a/queue-4.9/batman-adv-don-t-schedule-ogm-for-disabled-interface.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a9e2055aad05436a8a2bd5cc00906f0f16fd70c2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 16 Feb 2020 13:02:06 +0100 -Subject: batman-adv: Don't schedule OGM for disabled interface - -From: Sven Eckelmann - -[ 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 -Cc: Hillf Danton -Signed-off-by: Simon Wunderlich -Signed-off-by: Sasha Levin ---- - 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 2b663622bdb45..c22478d506325 100644 ---- a/net/batman-adv/bat_iv_ogm.c -+++ b/net/batman-adv/bat_iv_ogm.c -@@ -969,6 +969,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; -+ - /* interface already disabled by batadv_iv_ogm_iface_disable */ - if (!*ogm_buff) - return; --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 5470a278b28..6680c1da499 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -49,7 +49,6 @@ hsr-add-restart-routine-into-hsr_get_node_list.patch hsr-set-.netnsok-flag.patch kvm-vmx-do-not-allow-reexecute_instruction-when-skip.patch net-ipv4-don-t-let-pmtu-updates-increase-route-mtu.patch -batman-adv-don-t-schedule-ogm-for-disabled-interface.patch cpupower-avoid-multiple-definition-with-gcc-fno-comm.patch dt-bindings-net-fman-erratum-a050385.patch scsi-ipr-fix-softlockup-when-rescanning-devices-in-p.patch