drop batman patch from 4.9 and 4.14

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 (file)
index 927603c..0000000
--- a/queue-4.14/batman-adv-don-t-schedule-ogm-for-disabled-interface.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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: batman-adv: Don't schedule OGM for disabled interface
-
-From: Sven Eckelmann <sven@narfation.org>
-
-commit 8e8ce08198de193e3d21d42e96945216e3d9ac7f upstream.
-
-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>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/batman-adv/bat_iv_ogm.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/net/batman-adv/bat_iv_ogm.c
-+++ b/net/batman-adv/bat_iv_ogm.c
-@@ -926,6 +926,10 @@ static void batadv_iv_ogm_schedule(struc
-           (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
-               return;
- 
-+      /* 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

diff --git a/queue-4.14/series b/queue-4.14/series
index 8acb546821f5630e62c6d9f6020e9b1b281e4a32..dddc16f02cb32b473782838428c5f59dd5734cbd 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -51,7 +51,6 @@ x86-mce-fix-logic-and-comments-around-msr_ppin_ctl.patch
 iommu-dma-fix-msi-reservation-allocation.patch
 iommu-vt-d-dmar-replace-warn_taint-with-pr_warn-add_taint.patch
 iommu-vt-d-fix-a-bug-in-intel_iommu_iova_to_phys-for-huge-page.patch
-batman-adv-don-t-schedule-ogm-for-disabled-interface.patch
 pinctrl-meson-gxl-fix-gpiox-sdio-pins.patch
 pinctrl-core-remove-extra-kref_get-which-blocks-hogs-being-freed.patch
 nl80211-add-missing-attribute-validation-for-critical-protocol-indication.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 (file)
index bbb9353..0000000
--- a/queue-4.9/batman-adv-don-t-schedule-ogm-for-disabled-interface.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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: batman-adv: Don't schedule OGM for disabled interface
-
-From: Sven Eckelmann <sven@narfation.org>
-
-commit 8e8ce08198de193e3d21d42e96945216e3d9ac7f upstream.
-
-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>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/batman-adv/bat_iv_ogm.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/net/batman-adv/bat_iv_ogm.c
-+++ b/net/batman-adv/bat_iv_ogm.c
-@@ -934,6 +934,10 @@ static void batadv_iv_ogm_schedule(struc
-           (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
-               return;
- 
-+      /* 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

diff --git a/queue-4.9/series b/queue-4.9/series
index 56243115131f07c0bfaa1e405b16307f82159926..3869d3ac812d716cfa6ac2b7240cd597f5427b85 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -39,7 +39,6 @@ arc-define-__align_str-and-__align-symbols-for-arc.patch
 efi-fix-a-race-and-a-buffer-overflow-while-reading-efivars-via-sysfs.patch
 iommu-vt-d-dmar-replace-warn_taint-with-pr_warn-add_taint.patch
 iommu-vt-d-fix-a-bug-in-intel_iommu_iova_to_phys-for-huge-page.patch
-batman-adv-don-t-schedule-ogm-for-disabled-interface.patch
 nl80211-add-missing-attribute-validation-for-critical-protocol-indication.patch
 nl80211-add-missing-attribute-validation-for-beacon-report-scanning.patch
 nl80211-add-missing-attribute-validation-for-channel-switch.patch