rebase patches on top of Ubuntu-4.15.0-46.49

[pve-kernel.git] / patches / kernel / 0008-net-tcp-Fix-socket-lookups-with-SO_BINDTODEVICE.patch

diff --git a/patches/kernel/0008-net-tcp-Fix-socket-lookups-with-SO_BINDTODEVICE.patch b/patches/kernel/0008-net-tcp-Fix-socket-lookups-with-SO_BINDTODEVICE.patch
deleted file mode 100644 (file)
index b198390..0000000
--- a/patches/kernel/0008-net-tcp-Fix-socket-lookups-with-SO_BINDTODEVICE.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: David Ahern <dsahern@gmail.com>
-Date: Mon, 18 Jun 2018 12:30:37 -0700
-Subject: [PATCH] net/tcp: Fix socket lookups with SO_BINDTODEVICE
-
-Similar to 69678bcd4d2d ("udp: fix SO_BINDTODEVICE"), TCP socket lookups
-need to fail if dev_match is not true. Currently, a packet to a given port
-can match a socket bound to device when it should not. In the VRF case,
-this causes the lookup to hit a VRF socket and not a global socket
-resulting in a response trying to go through the VRF when it should it.
-
-Fixes: 3fa6f616a7a4d ("net: ipv4: add second dif to inet socket lookups")
-Fixes: 4297a0ef08572 ("net: ipv6: add second dif to inet6 socket lookups")
-Reported-by: Lou Berger <lberger@labn.net>
-Diagnosed-by: Renato Westphal <renato@opensourcerouting.org>
-Tested-by: Renato Westphal <renato@opensourcerouting.org>
-Signed-off-by: David Ahern <dsahern@gmail.com>
----
- net/ipv4/inet_hashtables.c  | 4 ++--
- net/ipv6/inet6_hashtables.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
-index e7d15fb0d94d..24b066c32e06 100644
---- a/net/ipv4/inet_hashtables.c
-+++ b/net/ipv4/inet_hashtables.c
-@@ -188,9 +188,9 @@ static inline int compute_score(struct sock *sk, struct net *net,
-                       bool dev_match = (sk->sk_bound_dev_if == dif ||
-                                         sk->sk_bound_dev_if == sdif);
- 
--                      if (exact_dif && !dev_match)
-+                      if (!dev_match)
-                               return -1;
--                      if (sk->sk_bound_dev_if && dev_match)
-+                      if (sk->sk_bound_dev_if)
-                               score += 4;
-               }
-               if (sk->sk_incoming_cpu == raw_smp_processor_id())
-diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
-index b01858f5deb1..6dc93ac28261 100644
---- a/net/ipv6/inet6_hashtables.c
-+++ b/net/ipv6/inet6_hashtables.c
-@@ -113,9 +113,9 @@ static inline int compute_score(struct sock *sk, struct net *net,
-                       bool dev_match = (sk->sk_bound_dev_if == dif ||
-                                         sk->sk_bound_dev_if == sdif);
- 
--                      if (exact_dif && !dev_match)
-+                      if (!dev_match)
-                               return -1;
--                      if (sk->sk_bound_dev_if && dev_match)
-+                      if (sk->sk_bound_dev_if)
-                               score++;
-               }
-               if (sk->sk_incoming_cpu == raw_smp_processor_id())