commit 45d2e3f062be85cd00aa9c04b1d800fa62c14745
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Oct 5 09:37:45 2015 +0200
- rel 2; fix for deadlock (cpu stuck etc)
kernel-small_fixes.patch | 35 +++++++++++++++++++++++++++++++++++
kernel.spec | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index e1f51f7..b0a777f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
%define have_pcmcia 0
%endif
-%define rel 1
+%define rel 2
%define basever 4.1
%define postver .10
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 01e03aa..4813cdc 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -97,3 +97,38 @@ index 28011fb1..c6ded6b 100644
.pkts_acked = bictcp_acked,
.owner = THIS_MODULE,
.name = "cubic",
+commit 83fccfc3940c4a2db90fd7e7079f5b465cd8c6af
+Author: Eric Dumazet <[email protected]>
+Date: Thu Aug 13 15:44:51 2015 -0700
+
+ inet: fix potential deadlock in reqsk_queue_unlink()
+
+ When replacing del_timer() with del_timer_sync(), I introduced
+ a deadlock condition :
+
+ reqsk_queue_unlink() is called from inet_csk_reqsk_queue_drop()
+
+ inet_csk_reqsk_queue_drop() can be called from many contexts,
+ one being the timer handler itself (reqsk_timer_handler()).
+
+ In this case, del_timer_sync() loops forever.
+
+ Simple fix is to test if timer is pending.
+
+ Fixes: 2235f2ac75fd ("inet: fix races with reqsk timers")
+ Signed-off-by: Eric Dumazet <[email protected]>
+ Signed-off-by: David S. Miller <[email protected]>
+
+diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
+index 05e3145..1349571 100644
+--- a/net/ipv4/inet_connection_sock.c
++++ b/net/ipv4/inet_connection_sock.c
+@@ -593,7 +593,7 @@ static bool reqsk_queue_unlink(struct request_sock_queue
*queue,
+ }
+
+ spin_unlock(&queue->syn_wait_lock);
+- if (del_timer_sync(&req->rsk_timer))
++ if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer))
+ reqsk_put(req);
+ return found;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/45d2e3f062be85cd00aa9c04b1d800fa62c14745
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
