Linux v3.19.8

This commit is contained in:
Laura Abbott 2015-05-11 13:29:33 -07:00
parent 8e9d5ed84c
commit 1e0fca9e7d
3 changed files with 5 additions and 39 deletions

View File

@ -1,31 +0,0 @@
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 1 May 2015 22:02:47 -0400
Subject: [PATCH] ipv4: Missing sk_nulls_node_init() in ping_unhash().
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@linux-foundation.org>
Reported-by: Wen Xu <hotdog3645@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/ipv4/ping.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 0ae28f517a9b..c0db43d2e1a6 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -158,6 +158,7 @@ void ping_unhash(struct sock *sk)
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;
--
2.3.6

View File

@ -74,7 +74,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
%define stable_update 7
%define stable_update 8
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@ -775,9 +775,6 @@ Patch26189: 0001-cx18-add-missing-caps-for-the-PCM-video-device.patch
#rhbz 1206036 1215989
Patch26193: toshiba_acpi-Do-not-register-vendor-backlight-when-a.patch
#CVE-2015-3636 rhbz 1218074 1218110
Patch26194: ipv4-Missing-sk_nulls_node_init-in-ping_unhash.patch
#rhbz 1218662
Patch26199: libata-Blacklist-queued-TRIM-on-all-Samsung-800-seri.patch
@ -1525,9 +1522,6 @@ ApplyPatch 0001-cx18-add-missing-caps-for-the-PCM-video-device.patch
#rhbz 1206036 1215989
ApplyPatch toshiba_acpi-Do-not-register-vendor-backlight-when-a.patch
#CVE-2015-3636 rhbz 1218074 1218110
ApplyPatch ipv4-Missing-sk_nulls_node_init-in-ping_unhash.patch
#rhbz 1218662
ApplyPatch libata-Blacklist-queued-TRIM-on-all-Samsung-800-seri.patch
@ -2342,6 +2336,9 @@ fi
# ||----w |
# || ||
%changelog
* Mon May 11 2015 Laura Abbott <labbott@fedoraproject.org> - 3.19.8-100
- Linux v3.19.8
* Thu May 07 2015 Laura Abbott <labbott@fedoraproject.org> - 3.19.7-100
- Linux v3.19.7

View File

@ -1,3 +1,3 @@
d3fc8316d4d4d04b65cbc2d70799e763 linux-3.19.tar.xz
15d8d2f97ce056488451a5bfb2944603 perf-man-3.19.tar.gz
b995a018938219892d4312d03b0f58ab patch-3.19.7.xz
a450d6f46c2397dec767ac409111c144 patch-3.19.8.xz