4.9.13-100.fc24.gnu

5 files changed, 15 insertions, 59 deletions

diff --git a/freed-ora/current/f24/dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch b/freed-ora/current/f24/dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch
deleted file mode 100644
index 433fd4b2b..000000000
--- a/freed-ora/current/f24/dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4 Mon Sep 17 00:00:00 2001
-From: Andrey Konovalov <andreyknvl@google.com>
-Date: Thu, 16 Feb 2017 17:22:46 +0100
-Subject: dccp: fix freeing skb too early for IPV6_RECVPKTINFO
-
-In the current DCCP implementation an skb for a DCCP_PKT_REQUEST packet
-is forcibly freed via __kfree_skb in dccp_rcv_state_process if
-dccp_v6_conn_request successfully returns.
-
-However, if IPV6_RECVPKTINFO is set on a socket, the address of the skb
-is saved to ireq->pktopts and the ref count for skb is incremented in
-dccp_v6_conn_request, so skb is still in use. Nevertheless, it gets freed
-in dccp_rcv_state_process.
-
-Fix by calling consume_skb instead of doing goto discard and therefore
-calling __kfree_skb.
-
-Similar fixes for TCP:
-
-fb7e2399ec17f1004c0e0ccfd17439f8759ede01 [TCP]: skb is unexpectedly freed.
-0aea76d35c9651d55bbaf746e7914e5f9ae5a25d tcp: SYN packets are now
-simply consumed
-
-Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
-Acked-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/dccp/input.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/net/dccp/input.c b/net/dccp/input.c
-index ba34718..8fedc2d 100644
---- a/net/dccp/input.c
-+++ b/net/dccp/input.c
-@@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
- 			if (inet_csk(sk)->icsk_af_ops->conn_request(sk,
- 								    skb) < 0)
- 				return 1;
--			goto discard;
-+			consume_skb(skb);
-+			return 0;
- 		}
- 		if (dh->dccph_type == DCCP_PKT_RESET)
- 			goto discard;
--- 
-cgit v0.12
-
diff --git a/freed-ora/current/f24/kernel.spec b/freed-ora/current/f24/kernel.spec
index 670bdf9f9..debd14888 100644
--- a/freed-ora/current/f24/kernel.spec
+++ b/freed-ora/current/f24/kernel.spec
@@ -92,7 +92,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 12
+%define stable_update 13
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -694,9 +694,6 @@ Patch861: w1-ds2490-USB-transfer-buffers-need-to-be-DMAable.patch
 #rhbz 1422969
 Patch862: rt2800-warning.patch
 
-#CVE-2017-6074
-Patch863: dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2324,6 +2321,12 @@ fi
 #
 # 
 %changelog
+* Mon Feb 27 2017 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 4.9.13-gnu.
+
+* Mon Feb 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.13-100
+- Linux v4.9.13
+
 * Fri Feb 24 2017 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 4.9.12-gnu.
 
diff --git a/freed-ora/current/f24/patch-4.9-gnu-4.9.12-gnu.xz.sign b/freed-ora/current/f24/patch-4.9-gnu-4.9.12-gnu.xz.sign
deleted file mode 100644
index 1a50c43cf..000000000
--- a/freed-ora/current/f24/patch-4.9-gnu-4.9.12-gnu.xz.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEABECAAYFAlivpRQACgkQvLfPh359R6fBywCdGKfFF18eBACAhGWywvydXbve
-/lIAoJi2HhgmmBx9FzPS54J9dk3YuzZC
-=jAUU
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/f24/patch-4.9-gnu-4.9.13-gnu.xz.sign b/freed-ora/current/f24/patch-4.9-gnu-4.9.13-gnu.xz.sign
new file mode 100644
index 000000000..a76b15341
--- /dev/null
+++ b/freed-ora/current/f24/patch-4.9-gnu-4.9.13-gnu.xz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEABECAAYFAlizq/sACgkQvLfPh359R6eG0wCdEiL7RLNjsbgjoAsyKQUrU0ft
+r+EAnA82K5fq8orbd4tSRdvkvTtutRX3
+=/gcV
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f24/sources b/freed-ora/current/f24/sources
index 5553540f1..30cfd8e36 100644
--- a/freed-ora/current/f24/sources
+++ b/freed-ora/current/f24/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-libre-4.9-gnu.tar.xz) = 885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816
 SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
-SHA512 (patch-4.9-gnu-4.9.12-gnu.xz) = 51612eda96b778e7f5f557ec8abeb9344c077f0849ec60a6f6d01fc4e1ca26d7609ee8c0d839e7c6e68e9344036e213240e1d2306df281fc1ca7f59ec5d7081e
+SHA512 (patch-4.9-gnu-4.9.13-gnu.xz) = c98ebf494a2adfe88cc3476bda4a603470febde239441ae6df5834c776e05d45badda8a5cf5d07bac6c7b5b6bb518eea5d4766b6a298024053508582ddbd73b8