diff options
author | Timo Teräs <timo.teras@iki.fi> | 2015-07-13 14:52:08 +0300 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-14 11:50:27 +0000 |
commit | 08e4b154102b4c2304d601aeae2677bd20e02188 (patch) | |
tree | 6dd8f7610b7b9bcae49e1b7b3cea92a9629a5e3f | |
parent | 53f869d1dd72b0bdf0e1e81ece16776132d57f24 (diff) | |
download | alpine_aports-08e4b154102b4c2304d601aeae2677bd20e02188.tar.bz2 alpine_aports-08e4b154102b4c2304d601aeae2677bd20e02188.tar.xz alpine_aports-08e4b154102b4c2304d601aeae2677bd20e02188.zip |
main/linux-grsec: upgrade to 3.18.18
and cherry-pick a pmtu fix from linux.git
(cherry picked from commit 990b6cb45af845d9a3fd3d7d32cebf4890aff37e)
-rw-r--r-- | main/linux-grsec/0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch | 31 | ||||
-rw-r--r-- | main/linux-grsec/APKBUILD | 20 |
2 files changed, 43 insertions, 8 deletions
diff --git a/main/linux-grsec/0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch b/main/linux-grsec/0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch new file mode 100644 index 0000000000..4890abaa7a --- /dev/null +++ b/main/linux-grsec/0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 3cdaa5be9e81a914e633a6be7b7d2ef75b528562 Mon Sep 17 00:00:00 2001 | ||
2 | From: Li Wei <lw@cn.fujitsu.com> | ||
3 | Date: Thu, 29 Jan 2015 16:09:03 +0800 | ||
4 | Subject: [PATCH] ipv4: Don't increase PMTU with Datagram Too Big message. | ||
5 | |||
6 | RFC 1191 said, "a host MUST not increase its estimate of the Path | ||
7 | MTU in response to the contents of a Datagram Too Big message." | ||
8 | |||
9 | Signed-off-by: Li Wei <lw@cn.fujitsu.com> | ||
10 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
11 | --- | ||
12 | net/ipv4/route.c | 3 +++ | ||
13 | 1 file changed, 3 insertions(+) | ||
14 | |||
15 | diff --git a/net/ipv4/route.c b/net/ipv4/route.c | ||
16 | index d58dd0e..52e1f2b 100644 | ||
17 | --- a/net/ipv4/route.c | ||
18 | +++ b/net/ipv4/route.c | ||
19 | @@ -966,6 +966,9 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu) | ||
20 | if (dst->dev->mtu < mtu) | ||
21 | return; | ||
22 | |||
23 | + if (rt->rt_pmtu && rt->rt_pmtu < mtu) | ||
24 | + return; | ||
25 | + | ||
26 | if (mtu < ip_rt_min_pmtu) | ||
27 | mtu = ip_rt_min_pmtu; | ||
28 | |||
29 | -- | ||
30 | 2.4.5 | ||
31 | |||
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index af94a6669a..71edc627ed 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | _mainflavor=grsec | 3 | _mainflavor=grsec |
4 | pkgname=linux-$_mainflavor | 4 | pkgname=linux-$_mainflavor |
5 | pkgver=3.18.17 | 5 | pkgver=3.18.18 |
6 | case $pkgver in | 6 | case $pkgver in |
7 | *.*.*) _kernver=${pkgver%.*};; | 7 | *.*.*) _kernver=${pkgver%.*};; |
8 | *.*) _kernver=${pkgver};; | 8 | *.*) _kernver=${pkgver};; |
@@ -17,10 +17,11 @@ options="!strip" | |||
17 | install= | 17 | install= |
18 | source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz | 18 | source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz |
19 | http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz | 19 | http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz |
20 | http://dev.alpinelinux.org/~tteras/grsec/grsecurity-3.1-3.18.17-201507050832-alpine.patch | 20 | http://dev.alpinelinux.org/~tteras/grsec/grsecurity-3.1-3.18.18-201507111210-alpine.patch |
21 | 21 | ||
22 | fix-memory-map-for-PIE-applications.patch | 22 | fix-memory-map-for-PIE-applications.patch |
23 | 0001-ip_tunnel-fix-ipv4-pmtu-check-to-honor-inner-ip-head.patch | 23 | 0001-ip_tunnel-fix-ipv4-pmtu-check-to-honor-inner-ip-head.patch |
24 | 0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch | ||
24 | fix-spi-nor-namespace-clash.patch | 25 | fix-spi-nor-namespace-clash.patch |
25 | imx6q-no-unclocked-sleep.patch | 26 | imx6q-no-unclocked-sleep.patch |
26 | 27 | ||
@@ -201,10 +202,11 @@ dev() { | |||
201 | } | 202 | } |
202 | 203 | ||
203 | md5sums="9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz | 204 | md5sums="9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz |
204 | ff54e954e26589a2a8a237bfe793ac41 patch-3.18.17.xz | 205 | 8d2baec3d5817eb5501d5b1141279ef6 patch-3.18.18.xz |
205 | e4775dbac57c80905e2c2d99aedbfa1a grsecurity-3.1-3.18.17-201507050832-alpine.patch | 206 | 23230f4307dd6aac74266f7d80ef5ac9 grsecurity-3.1-3.18.18-201507111210-alpine.patch |
206 | c6a4ae7e8ca6159e1631545515805216 fix-memory-map-for-PIE-applications.patch | 207 | c6a4ae7e8ca6159e1631545515805216 fix-memory-map-for-PIE-applications.patch |
207 | b7f15811ab0ae0a1225c03cc2cc24411 0001-ip_tunnel-fix-ipv4-pmtu-check-to-honor-inner-ip-head.patch | 208 | b7f15811ab0ae0a1225c03cc2cc24411 0001-ip_tunnel-fix-ipv4-pmtu-check-to-honor-inner-ip-head.patch |
209 | 5d708f155fff5fbbbeed2785423832e2 0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch | ||
208 | b0337a2a9abed17c37eae5db332522d2 fix-spi-nor-namespace-clash.patch | 210 | b0337a2a9abed17c37eae5db332522d2 fix-spi-nor-namespace-clash.patch |
209 | 1a307fc1d63231bf01d22493a4f14378 imx6q-no-unclocked-sleep.patch | 211 | 1a307fc1d63231bf01d22493a4f14378 imx6q-no-unclocked-sleep.patch |
210 | 9c3fdf1aba9dffc9a5ebc16a2ba37735 config-grsec.x86 | 212 | 9c3fdf1aba9dffc9a5ebc16a2ba37735 config-grsec.x86 |
@@ -213,10 +215,11 @@ b0337a2a9abed17c37eae5db332522d2 fix-spi-nor-namespace-clash.patch | |||
213 | 18cb4521f9a8847637292f9f4c9e8256 config-virtgrsec.x86 | 215 | 18cb4521f9a8847637292f9f4c9e8256 config-virtgrsec.x86 |
214 | 80b45900be93b1183a6382adf710d961 config-virtgrsec.x86_64" | 216 | 80b45900be93b1183a6382adf710d961 config-virtgrsec.x86_64" |
215 | sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd linux-3.18.tar.xz | 217 | sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd linux-3.18.tar.xz |
216 | 190b769580a766add68c3e3a8878a725b36fe6877991f3af0cb4a1d6b5eeccf8 patch-3.18.17.xz | 218 | bd43b683811ecd3b9515a3047ded08a8263f02750e335b96dfc99bf589e90d9e patch-3.18.18.xz |
217 | 98fc77df5d82ce127999923dadb203c9024f7539673b1c2efd46917939cb4864 grsecurity-3.1-3.18.17-201507050832-alpine.patch | 219 | f416fc2bcdfa2eabed2680d55d102d78ca47e18f17fd206794ac285955f32452 grsecurity-3.1-3.18.18-201507111210-alpine.patch |
218 | 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7 fix-memory-map-for-PIE-applications.patch | 220 | 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7 fix-memory-map-for-PIE-applications.patch |
219 | b4a5d6fc7b1dfe43cee18cf47db3f588a4b8a03e6d474af9a6f9ef487233ba70 0001-ip_tunnel-fix-ipv4-pmtu-check-to-honor-inner-ip-head.patch | 221 | b4a5d6fc7b1dfe43cee18cf47db3f588a4b8a03e6d474af9a6f9ef487233ba70 0001-ip_tunnel-fix-ipv4-pmtu-check-to-honor-inner-ip-head.patch |
222 | e6cef82ab135a8ab23111a90b95d3d034eaed32d7c5829c0322aaac491b781b7 0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch | ||
220 | 01279cfb93273d99670c56e2465957ecde3d03693beeb929a743f03afa0b7bdc fix-spi-nor-namespace-clash.patch | 223 | 01279cfb93273d99670c56e2465957ecde3d03693beeb929a743f03afa0b7bdc fix-spi-nor-namespace-clash.patch |
221 | 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3 imx6q-no-unclocked-sleep.patch | 224 | 21179fbb22a5b74af0a609350ae1a170e232908572b201d02e791d2ce0a685d3 imx6q-no-unclocked-sleep.patch |
222 | 5fc6db215c9566d937ed5162cea3a554352ba82a7b6754552e46d02ec39368d7 config-grsec.x86 | 225 | 5fc6db215c9566d937ed5162cea3a554352ba82a7b6754552e46d02ec39368d7 config-grsec.x86 |
@@ -225,10 +228,11 @@ c30182bf8c312141ef516154cbcf9ae6670dffeafa650126c2f375b5082087f3 config-grsec.x | |||
225 | 47048993111506ab74db24c92d39b536cf5e684975844907d5cb6198c1dfd87f config-virtgrsec.x86 | 228 | 47048993111506ab74db24c92d39b536cf5e684975844907d5cb6198c1dfd87f config-virtgrsec.x86 |
226 | 015ce51a03f1337673b47ef996b77c55cf50a28240e37c5ebf7e66f5886d3aef config-virtgrsec.x86_64" | 229 | 015ce51a03f1337673b47ef996b77c55cf50a28240e37c5ebf7e66f5886d3aef config-virtgrsec.x86_64" |
227 | sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 linux-3.18.tar.xz | 230 | sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 linux-3.18.tar.xz |
228 | 03a78cc7b72150570fd0f24ad44f491dc57913e0675f31b7322af8ccbf41deea05a0b04c7058f9c85352cb03a976b3817d3544d8c690cc67e26ec08672c09afa patch-3.18.17.xz | 231 | 4f1c15256b9fd72f8dc97871ab680db889bdf8c7df9ba60d36054abfdc979676e9b11d74b0438021e612046f48bcae54dc57c2628c12accdcb4fcc29231aca46 patch-3.18.18.xz |
229 | 0f0fec207e67fa96587159316fbc0be4b4559a9c437fdaeb8747d50ec59f34a6650c146f38138941489e364ea29e94aad72ff1f3d6ef92cccc0028b9514d12f6 grsecurity-3.1-3.18.17-201507050832-alpine.patch | 232 | d5ee05c89c6416e70a92b0ae7f4ec5a4f1f7395e7e3ac1e5f7ee75f0a23aa2bc5cd8237cafa4defcd7ea1dd0e1e4bd30756019a8f90af4cacc07d98eff1a7832 grsecurity-3.1-3.18.18-201507111210-alpine.patch |
230 | 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7 fix-memory-map-for-PIE-applications.patch | 233 | 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7 fix-memory-map-for-PIE-applications.patch |
231 | c5f7bda0a5bf88d7ce5de8c405ee5a018b652d70def2a5c6eea8e718b39efc0fed860bb61c70d950ba42cb11e0c264ee5ddd9a1505b7b60d19a56322ece894b6 0001-ip_tunnel-fix-ipv4-pmtu-check-to-honor-inner-ip-head.patch | 234 | c5f7bda0a5bf88d7ce5de8c405ee5a018b652d70def2a5c6eea8e718b39efc0fed860bb61c70d950ba42cb11e0c264ee5ddd9a1505b7b60d19a56322ece894b6 0001-ip_tunnel-fix-ipv4-pmtu-check-to-honor-inner-ip-head.patch |
235 | 0d533a7ae0fd7a524326312d5e10f505936941826766b778508c91698e1ba5b7125248cc6fbbb6adc27db0f6172a68c818fb12818e6d6a27cf4f85a961013bdb 0002-ipv4-Don-t-increase-PMTU-with-Datagram-Too-Big-messa.patch | ||
232 | 4e3aeb70712f9838afea75fe9e6c1389414d833a89286ea55441d6a8d54ce74b0e39b565721e3153443af0a614bff57c767251b7e5b81faa5e0784eddfcd2164 fix-spi-nor-namespace-clash.patch | 236 | 4e3aeb70712f9838afea75fe9e6c1389414d833a89286ea55441d6a8d54ce74b0e39b565721e3153443af0a614bff57c767251b7e5b81faa5e0784eddfcd2164 fix-spi-nor-namespace-clash.patch |
233 | 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221 imx6q-no-unclocked-sleep.patch | 237 | 87d1ad59732f265a5b0db54490dc1762c14ea4b868e7eb1aedc3ce57b48046de7bbc08cf5cfcf6f1380fa84063b0edb16ba3d5e3c5670be9bbb229275c88b221 imx6q-no-unclocked-sleep.patch |
234 | 1c8861bd213f2ed5a5d4b6205ca3453958f110ad0245940c824a3ef3983a10a937adf7e401f087d7cc6e6d0054cbb187139ef426b6e00d7fa707aab20f1d2666 config-grsec.x86 | 238 | 1c8861bd213f2ed5a5d4b6205ca3453958f110ad0245940c824a3ef3983a10a937adf7e401f087d7cc6e6d0054cbb187139ef426b6e00d7fa707aab20f1d2666 config-grsec.x86 |