drop some netlink patches for the moment.

diff --git a/queue-4.4/netlink-do-not-subscribe-to-non-existent-groups.patch b/queue-4.4/netlink-do-not-subscribe-to-non-existent-groups.patch
deleted file mode 100644 (file)
index de809d2..0000000
--- a/queue-4.4/netlink-do-not-subscribe-to-non-existent-groups.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From foo@baz Fri Aug  3 21:25:07 CEST 2018
-From: Dmitry Safonov <dima@arista.com>
-Date: Fri, 27 Jul 2018 16:54:44 +0100
-Subject: netlink: Do not subscribe to non-existent groups
-
-From: Dmitry Safonov <dima@arista.com>
-
-[ Upstream commit 7acf9d4237c46894e0fa0492dd96314a41742e84 ]
-
-Make ABI more strict about subscribing to group > ngroups.
-Code doesn't check for that and it looks bogus.
-(one can subscribe to non-existing group)
-Still, it's possible to bind() to all possible groups with (-1)
-
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Herbert Xu <herbert@gondor.apana.org.au>
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Cc: netdev@vger.kernel.org
-Signed-off-by: Dmitry Safonov <dima@arista.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/netlink/af_netlink.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/net/netlink/af_netlink.c
-+++ b/net/netlink/af_netlink.c
-@@ -983,6 +983,7 @@ static int netlink_bind(struct socket *s
-               if (err)
-                       return err;
-       }
-+      groups &= (1UL << nlk->ngroups) - 1;
- 
-       bound = nlk->bound;
-       if (bound) {

diff --git a/queue-4.4/netlink-don-t-shift-with-ub-on-nlk-ngroups.patch b/queue-4.4/netlink-don-t-shift-with-ub-on-nlk-ngroups.patch
deleted file mode 100644 (file)
index b0326b0..0000000
--- a/queue-4.4/netlink-don-t-shift-with-ub-on-nlk-ngroups.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From foo@baz Fri Aug  3 21:25:07 CEST 2018
-From: Dmitry Safonov <dima@arista.com>
-Date: Mon, 30 Jul 2018 18:32:36 +0100
-Subject: netlink: Don't shift with UB on nlk->ngroups
-
-From: Dmitry Safonov <dima@arista.com>
-
-[ Upstream commit 61f4b23769f0cc72ae62c9a81cf08f0397d40da8 ]
-
-On i386 nlk->ngroups might be 32 or 0. Which leads to UB, resulting in
-hang during boot.
-Check for 0 ngroups and use (unsigned long long) as a type to shift.
-
-Fixes: 7acf9d4237c4 ("netlink: Do not subscribe to non-existent groups").
-Reported-by: kernel test robot <rong.a.chen@intel.com>
-Signed-off-by: Dmitry Safonov <dima@arista.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/netlink/af_netlink.c |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/net/netlink/af_netlink.c
-+++ b/net/netlink/af_netlink.c
-@@ -983,7 +983,11 @@ static int netlink_bind(struct socket *s
-               if (err)
-                       return err;
-       }
--      groups &= (1UL << nlk->ngroups) - 1;
-+
-+      if (nlk->ngroups == 0)
-+              groups = 0;
-+      else
-+              groups &= (1ULL << nlk->ngroups) - 1;
- 
-       bound = nlk->bound;
-       if (bound) {

diff --git a/queue-4.4/series b/queue-4.4/series
index 866803fad0a8f2205cf06cfcafb5706c04f6c0ec..57e55aa07867eb928e0a378627ddf4803df98e18 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -103,8 +103,6 @@ ipv4-remove-bug_on-from-fib_compute_spec_dst.patch
 net-fix-amd-xgbe-flow-control-issue.patch
 net-lan78xx-fix-rx-handling-before-first-packet-is-send.patch
 xen-netfront-wait-xenbus-state-change-when-load-module-manually.patch
-netlink-do-not-subscribe-to-non-existent-groups.patch
-netlink-don-t-shift-with-ub-on-nlk-ngroups.patch
 net-stmmac-align-dma-stuff-to-largest-cache-line-length.patch
 tcp-do-not-force-quickack-when-receiving-out-of-order-packets.patch
 tcp-add-max_quickacks-param-to-tcp_incr_quickack-and-tcp_enter_quickack_mode.patch

diff --git a/queue-4.9/netlink-do-not-subscribe-to-non-existent-groups.patch b/queue-4.9/netlink-do-not-subscribe-to-non-existent-groups.patch
deleted file mode 100644 (file)
index 84160fb..0000000
--- a/queue-4.9/netlink-do-not-subscribe-to-non-existent-groups.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From foo@baz Fri Aug  3 21:22:28 CEST 2018
-From: Dmitry Safonov <dima@arista.com>
-Date: Fri, 27 Jul 2018 16:54:44 +0100
-Subject: netlink: Do not subscribe to non-existent groups
-
-From: Dmitry Safonov <dima@arista.com>
-
-[ Upstream commit 7acf9d4237c46894e0fa0492dd96314a41742e84 ]
-
-Make ABI more strict about subscribing to group > ngroups.
-Code doesn't check for that and it looks bogus.
-(one can subscribe to non-existing group)
-Still, it's possible to bind() to all possible groups with (-1)
-
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Herbert Xu <herbert@gondor.apana.org.au>
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Cc: netdev@vger.kernel.org
-Signed-off-by: Dmitry Safonov <dima@arista.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/netlink/af_netlink.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/net/netlink/af_netlink.c
-+++ b/net/netlink/af_netlink.c
-@@ -983,6 +983,7 @@ static int netlink_bind(struct socket *s
-               if (err)
-                       return err;
-       }
-+      groups &= (1UL << nlk->ngroups) - 1;
- 
-       bound = nlk->bound;
-       if (bound) {

diff --git a/queue-4.9/netlink-don-t-shift-with-ub-on-nlk-ngroups.patch b/queue-4.9/netlink-don-t-shift-with-ub-on-nlk-ngroups.patch
deleted file mode 100644 (file)
index beb9c30..0000000
--- a/queue-4.9/netlink-don-t-shift-with-ub-on-nlk-ngroups.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From foo@baz Fri Aug  3 21:22:28 CEST 2018
-From: Dmitry Safonov <dima@arista.com>
-Date: Mon, 30 Jul 2018 18:32:36 +0100
-Subject: netlink: Don't shift with UB on nlk->ngroups
-
-From: Dmitry Safonov <dima@arista.com>
-
-[ Upstream commit 61f4b23769f0cc72ae62c9a81cf08f0397d40da8 ]
-
-On i386 nlk->ngroups might be 32 or 0. Which leads to UB, resulting in
-hang during boot.
-Check for 0 ngroups and use (unsigned long long) as a type to shift.
-
-Fixes: 7acf9d4237c4 ("netlink: Do not subscribe to non-existent groups").
-Reported-by: kernel test robot <rong.a.chen@intel.com>
-Signed-off-by: Dmitry Safonov <dima@arista.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/netlink/af_netlink.c |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/net/netlink/af_netlink.c
-+++ b/net/netlink/af_netlink.c
-@@ -983,7 +983,11 @@ static int netlink_bind(struct socket *s
-               if (err)
-                       return err;
-       }
--      groups &= (1UL << nlk->ngroups) - 1;
-+
-+      if (nlk->ngroups == 0)
-+              groups = 0;
-+      else
-+              groups &= (1ULL << nlk->ngroups) - 1;
- 
-       bound = nlk->bound;
-       if (bound) {

diff --git a/queue-4.9/series b/queue-4.9/series
index fe375afd7c226b626f650929cd18d2796f3091dd..96ae9b97953963d2ecdd3df22a3fa8d6774f8460 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -6,8 +6,6 @@ net-mdio-mux-bcm-iproc-fix-wrong-getter-and-setter-pair.patch
 net-stmmac-align-dma-stuff-to-largest-cache-line-length.patch
 tcp_bbr-fix-bw-probing-to-raise-in-flight-data-for-very-small-bdps.patch
 xen-netfront-wait-xenbus-state-change-when-load-module-manually.patch
-netlink-do-not-subscribe-to-non-existent-groups.patch
-netlink-don-t-shift-with-ub-on-nlk-ngroups.patch
 tcp-do-not-force-quickack-when-receiving-out-of-order-packets.patch
 tcp-add-max_quickacks-param-to-tcp_incr_quickack-and-tcp_enter_quickack_mode.patch
 tcp-do-not-aggressively-quick-ack-after-ecn-events.patch