[kernel] r22744 - in dists/wheezy-security/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun Jun 14 19:52:59 2015
New Revision: 22744

Log:
ipv4: Missing sk_nulls_node_init() in ping_unhash(). (CVE-2015-3636)

Added:
   dists/wheezy-security/linux/debian/patches/bugfix/all/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch
Modified:
   dists/wheezy-security/linux/debian/changelog
   dists/wheezy-security/linux/debian/patches/series

Modified: dists/wheezy-security/linux/debian/changelog
==============================================================================
--- dists/wheezy-security/linux/debian/changelog	Sun Jun 14 19:50:58 2015	(r22743)
+++ dists/wheezy-security/linux/debian/changelog	Sun Jun 14 19:52:59 2015	(r22744)
@@ -5,6 +5,7 @@
   * udf: Remove repeated loads blocksize
   * udf: Check length of extended attributes and allocation descriptors
     (CVE-2015-4167)
+  * ipv4: Missing sk_nulls_node_init() in ping_unhash(). (CVE-2015-3636)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 14 Jun 2015 20:44:48 +0100
 

Added: dists/wheezy-security/linux/debian/patches/bugfix/all/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy-security/linux/debian/patches/bugfix/all/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch	Sun Jun 14 19:52:59 2015	(r22744)
@@ -0,0 +1,27 @@
+From: "David S. Miller" <davem at davemloft.net>
+Date: Fri, 1 May 2015 22:02:47 -0400
+Subject: ipv4: Missing sk_nulls_node_init() in ping_unhash().
+Origin: https://git.kernel.org/linus/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 <torvalds at linux-foundation.org>
+Reported-by: Wen Xu <hotdog3645 at gmail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ 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 = isk->inet_sport = 0;
+ 		sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);

Modified: dists/wheezy-security/linux/debian/patches/series
==============================================================================
--- dists/wheezy-security/linux/debian/patches/series	Sun Jun 14 19:50:58 2015	(r22743)
+++ dists/wheezy-security/linux/debian/patches/series	Sun Jun 14 19:52:59 2015	(r22744)
@@ -1169,3 +1169,4 @@
 bugfix/all/pipe-iovec-fix-memory-corruption-when-retrying-atomi.patch
 bugfix/all/udf-remove-repeated-loads-blocksize.patch
 bugfix/all/udf-check-length-of-extended-attributes-and-allocati.patch
+bugfix/all/ipv4-missing-sk_nulls_node_init-in-ping_unhash.patch