Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:43 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:48 +0200
commit9a7aacaeb0e3521d75b5743d92c93b65b3ea7b64 (patch)
treefdcfbecb3566509c68add861b4d2710819a42038
parent60eb94bc0e35fecc2e52f4436798a8a1ae58d11d (diff)
ipv4: Fix raw socket lookup for local traffic (bnc#1012628).
-rw-r--r--patches.kernel.org/5.1.3-018-ipv4-Fix-raw-socket-lookup-for-local-traffic.patch52
-rw-r--r--series.conf1
2 files changed, 53 insertions, 0 deletions
diff --git a/patches.kernel.org/5.1.3-018-ipv4-Fix-raw-socket-lookup-for-local-traffic.patch b/patches.kernel.org/5.1.3-018-ipv4-Fix-raw-socket-lookup-for-local-traffic.patch
new file mode 100644
index 0000000000..e68346debf
--- /dev/null
+++ b/patches.kernel.org/5.1.3-018-ipv4-Fix-raw-socket-lookup-for-local-traffic.patch
@@ -0,0 +1,52 @@
+From: David Ahern <dsahern@gmail.com>
+Date: Tue, 7 May 2019 20:44:59 -0700
+Subject: [PATCH] ipv4: Fix raw socket lookup for local traffic
+References: bnc#1012628
+Patch-mainline: 5.1.3
+Git-commit: 19e4e768064a87b073a4b4c138b55db70e0cfb9f
+
+[ Upstream commit 19e4e768064a87b073a4b4c138b55db70e0cfb9f ]
+
+inet_iif should be used for the raw socket lookup. inet_iif considers
+rt_iif which handles the case of local traffic.
+
+As it stands, ping to a local address with the '-I <dev>' option fails
+ever since ping was changed to use SO_BINDTODEVICE instead of
+cmsg + IP_PKTINFO.
+
+IPv6 works fine.
+
+Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
+Signed-off-by: David Ahern <dsahern@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ net/ipv4/raw.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
+index c55a5432cf37..dc91c27bb788 100644
+--- a/net/ipv4/raw.c
++++ b/net/ipv4/raw.c
+@@ -173,6 +173,7 @@ static int icmp_filter(const struct sock *sk, const struct sk_buff *skb)
+ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash)
+ {
+ int sdif = inet_sdif(skb);
++ int dif = inet_iif(skb);
+ struct sock *sk;
+ struct hlist_head *head;
+ int delivered = 0;
+@@ -185,8 +186,7 @@ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash)
+
+ net = dev_net(skb->dev);
+ sk = __raw_v4_lookup(net, __sk_head(head), iph->protocol,
+- iph->saddr, iph->daddr,
+- skb->dev->ifindex, sdif);
++ iph->saddr, iph->daddr, dif, sdif);
+
+ while (sk) {
+ delivered = 1;
+--
+2.21.0
+
diff --git a/series.conf b/series.conf
index 18fd2bbf51..633602774d 100644
--- a/series.conf
+++ b/series.conf
@@ -103,6 +103,7 @@
patches.kernel.org/5.1.3-015-bridge-Fix-error-path-for-kobject_init_and_add.patch
patches.kernel.org/5.1.3-016-dpaa_eth-fix-SG-frame-cleanup.patch
patches.kernel.org/5.1.3-017-fib_rules-return-0-directly-if-an-exactly-same-.patch
+ patches.kernel.org/5.1.3-018-ipv4-Fix-raw-socket-lookup-for-local-traffic.patch
########################################################
# Build fixes that apply to the vanilla kernel too.