3.18-stable patches

added patches:
	ipv4-map-neigh-lookup-keys-in-__ipv4_neigh_lookup_noref.patch

diff --git a/queue-3.18/ipv4-map-neigh-lookup-keys-in-__ipv4_neigh_lookup_noref.patch b/queue-3.18/ipv4-map-neigh-lookup-keys-in-__ipv4_neigh_lookup_noref.patch
new file mode 100644 (file)
index 0000000..21a0254
--- /dev/null
+++ b/queue-3.18/ipv4-map-neigh-lookup-keys-in-__ipv4_neigh_lookup_noref.patch
@@ -0,0 +1,47 @@
+From wanghan1995315@gmail.com  Wed Feb  7 17:17:43 2018
+From: Wang Han <wanghan1995315@gmail.com>
+Date: Fri, 2 Feb 2018 23:06:51 +0800
+Subject: ipv4: Map neigh lookup keys in __ipv4_neigh_lookup_noref()
+To: stable@vger.kernel.org
+Message-ID: <20180202224114.00002fd9@gmail.com>
+
+From: Wang Han <wanghan1995315@gmail.com>
+
+Commit 6c16fa957e84 is an incorrect backport as we map the keys in
+struct __ipv4_neigh_lookup(), but the correct place to add the
+code is struct __ipv4_neigh_lookup_noref(), compared to upstream.
+
+Fix it by moving the code, or fewer cases will be covered as
+__ipv4_neigh_lookup_noref() will be called unconditionally from
+__ipv4_neigh_lookup(), and it can be called from other places
+such as ip_output.c.
+
+Fixes: 6c16fa957e84 (ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY)
+Signed-off-by: Wang Han <wanghan1995315@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/net/arp.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/net/arp.h
++++ b/include/net/arp.h
+@@ -22,6 +22,9 @@ static inline struct neighbour *__ipv4_n
+       struct neighbour *n;
+       u32 hash_val;
+ 
++      if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))
++              key = INADDR_ANY;
++
+       hash_val = arp_hashfn(key, dev, nht->hash_rnd[0]) >> (32 - nht->hash_shift);
+       for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
+            n != NULL;
+@@ -37,9 +40,6 @@ static inline struct neighbour *__ipv4_n
+ {
+       struct neighbour *n;
+ 
+-      if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))
+-              key = INADDR_ANY;
+-
+       rcu_read_lock_bh();
+       n = __ipv4_neigh_lookup_noref(dev, key);
+       if (n && !atomic_inc_not_zero(&n->refcnt))

diff --git a/queue-3.18/series b/queue-3.18/series
index f1f75bca9d2d8e1948ba9317b17ba6274d770ba1..05033e53de276ac3f8a37c3e06653c589d72b41e 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -7,3 +7,4 @@ tcp-release-sk_frag.page-in-tcp_disconnect.patch
 arm-exynos_defconfig-enable-options-to-mount-a-rootfs-via-nfs.patch
 arm-exynos_defconfig-enable-nfsv4-client.patch
 keys-encrypted-fix-buffer-overread-in-valid_master_desc.patch
+ipv4-map-neigh-lookup-keys-in-__ipv4_neigh_lookup_noref.patch