diff options
| -rw-r--r-- | main/linux-vanilla/0001-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch | 40 | ||||
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 18 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.armhf | 5 |
3 files changed, 10 insertions, 53 deletions
diff --git a/main/linux-vanilla/0001-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch b/main/linux-vanilla/0001-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch deleted file mode 100644 index fdd23d5cc5..0000000000 --- a/main/linux-vanilla/0001-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 83fccfc3940c4a2db90fd7e7079f5b465cd8c6af Mon Sep 17 00:00:00 2001 -From: Eric Dumazet <edumazet@google.com> -Date: Thu, 13 Aug 2015 15:44:51 -0700 -Subject: [PATCH] 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 <edumazet@google.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - net/ipv4/inet_connection_sock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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; - } --- -2.6.0 - diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD index 748ca23801..cbad03f7f4 100644 --- a/main/linux-vanilla/APKBUILD +++ b/main/linux-vanilla/APKBUILD @@ -2,7 +2,7 @@ _flavor=vanilla pkgname=linux-${_flavor} -pkgver=4.1.10 +pkgver=4.1.11 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -16,7 +16,6 @@ options="!strip" _config=${config:-config-vanilla.${CARCH}} install= source="http://ftp.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz - 0001-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch config-vanilla.armhf config-vanilla.x86 @@ -162,20 +161,17 @@ dev() { } md5sums="fe9dc0f6729f36400ea81aa41d614c37 linux-4.1.tar.xz -ffa7fdc282af20f2b48b95b2687b7452 0001-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch -0ad79e12f21ad307d767a7fe516d264a config-vanilla.armhf +8d4820f5abed2b8cf4fd6e56c9302f3b config-vanilla.armhf 376bae192604828303b9643811a62f33 config-vanilla.x86 e6f826b0d12b106a5be8b3386fe025e7 config-vanilla.x86_64 -599cb082ef44d8fb76ad8fd49d1b50fc patch-4.1.10.xz" +46a403b167416719901565190298e680 patch-4.1.11.xz" sha256sums="caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f linux-4.1.tar.xz -c56583010561ca7d7b5e5aa3eed67c939f67deb2d22af7155e475c10baa4d7a5 0001-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch -02ef88ac83d75b5bf18ca4643b00db518f4c6832aca20d1e579c8ff0a80dbd5d config-vanilla.armhf +8be1ee04ff313327169f186f397d36dab15bef9d46904f81a2e9b69402c7264f config-vanilla.armhf f8b3d63753088345d9424d561c4ae17eeca58325e85a0db9471d9de92a7bfb50 config-vanilla.x86 85521da5ca80783b91a7cb1bae5c359665e8de75b52aa57c11b8b09e52c3f82b config-vanilla.x86_64 -929e210fe6dbd5dd26812c146630be14e979aae6c960a2feb39544babb8e73cb patch-4.1.10.xz" +f98156dd7ceac2849de16b38cdb7a530cd3c74833ab613e0822b7bc4583cccb1 patch-4.1.11.xz" sha512sums="168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 linux-4.1.tar.xz -32ae58cf74d5e02cb09445be35772dad0a517949bd1836f8dbc90b871de67901b61dba5eccdc2a795a9f7e5c06831335504a738205eb49768f7424cf30ddd8ae 0001-inet-fix-potential-deadlock-in-reqsk_queue_unlink.patch -4074fb870a1d75057a7824ed9992f9a2492a2a68dbeedc0e77ea868ceb37c3d48f4a1973c79014b8ee6a21baf38656a6cb04af4d10764c8147fed78094f075f4 config-vanilla.armhf +d1f6a4d5f02bc3a3ea6f047f450d86b43040989949d086672193ab29378a3acacf13573f42b8b94952bffee38cfa5ba69ba04c7893c199610b99effca5db5c69 config-vanilla.armhf d68ccbe54b79ccce9cff920af642a7435f8682f00130249481a157e7b1a104466cdf8429fe0e0313ae55805b7bc6277d9bfe8bac2b255b179c3413bf2b431e55 config-vanilla.x86 5e9ea0d2beab662bd28865501da963040fbbdec95244025924508a045ce5bfb3c628baff598cc35a9a410016782914bd102e8f16ef52a76b2f1f27e3310fa521 config-vanilla.x86_64 -3b5cb5c8f494958c39a06a1b416e3e5a075a3c76c44f8bf1ae5a14deec9861407100c2ef59b0720e8fc0729b5c8422b4d819ff59f1f7ec4eed20c5ba8a95d6d5 patch-4.1.10.xz" +ebd9f9ed7a4921795a0aee43440f6c73bf2ba058a690eb96031b978e61e390ef4d3b64e818a7cce7fe520adb20b93e4b7dd485b50d32c2dcf3012db3477a852c patch-4.1.11.xz" diff --git a/main/linux-vanilla/config-vanilla.armhf b/main/linux-vanilla/config-vanilla.armhf index 99dca1d8c0..29e01cba55 100644 --- a/main/linux-vanilla/config-vanilla.armhf +++ b/main/linux-vanilla/config-vanilla.armhf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.1.10 Kernel Configuration +# Linux/arm 4.1.11 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1454,7 +1454,8 @@ CONFIG_ARM_CCN=y # CONFIG_BRCMSTB_GISB_ARB is not set # CONFIG_IMX_WEIM is not set CONFIG_VEXPRESS_CONFIG=y -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=m |