From b4ca76c29185da241dc80bd7f1e6b774b22676e3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 8 May 2015 13:57:04 +0200 Subject: [PATCH] 3.10-stable patches added patches: ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch --- ...ng-sk_nulls_node_init-in-ping_unhash.patch | 32 +++++++++++++++++++ queue-3.10/series | 1 + queue-3.14/series | 1 + queue-4.0/series | 6 ++++ 4 files changed, 40 insertions(+) create mode 100644 queue-3.10/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch create mode 100644 queue-3.10/series create mode 100644 queue-3.14/series create mode 100644 queue-4.0/series diff --git a/queue-3.10/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch b/queue-3.10/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch new file mode 100644 index 00000000000..9fb6d73fe8b --- /dev/null +++ b/queue-3.10/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch @@ -0,0 +1,32 @@ +From foo@baz Fri May 8 13:15:43 CEST 2015 +From: "David S. Miller" +Date: Fri, 1 May 2015 22:02:47 -0400 +Subject: [PATCH] ipv4: Missing sk_nulls_node_init() in ping_unhash(). + +From: "David S. Miller" + +[ Upstream commit a134f083e79fb4c3d0a925691e732c56911b4326 ] + +If we don't do that, then the poison value is left in the ->pprev +backlink. + +This can cause crashes if we do a disconnect, followed by a connect(). + +Tested-by: Linus Torvalds +Reported-by: Wen Xu +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv4/ping.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/ipv4/ping.c ++++ b/net/ipv4/ping.c +@@ -139,6 +139,7 @@ static void ping_v4_unhash(struct sock * + if (sk_hashed(sk)) { + write_lock_bh(&ping_table.lock); + hlist_nulls_del(&sk->sk_nulls_node); ++ sk_nulls_node_init(&sk->sk_nulls_node); + sock_put(sk); + isk->inet_num = 0; + isk->inet_sport = 0; diff --git a/queue-3.10/series b/queue-3.10/series new file mode 100644 index 00000000000..3873c7853cf --- /dev/null +++ b/queue-3.10/series @@ -0,0 +1 @@ +ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch diff --git a/queue-3.14/series b/queue-3.14/series new file mode 100644 index 00000000000..3873c7853cf --- /dev/null +++ b/queue-3.14/series @@ -0,0 +1 @@ +ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch diff --git a/queue-4.0/series b/queue-4.0/series new file mode 100644 index 00000000000..619c949aa93 --- /dev/null +++ b/queue-4.0/series @@ -0,0 +1,6 @@ +bpf-fix-64-bit-divide.patch +route-use-ipv4_mtu-instead-of-raw-rt_pmtu.patch +mlx4-fix-tx-ring-affinity_mask-creation.patch +cxgb4-fix-mc1-memory-offset-calculation.patch +net-mlx4_en-schedule-napi-when-rx-buffers-allocation-fails.patch +ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch -- 2.47.3