diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-05-06 13:41:44 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-05-07 16:19:25 +0000 |
commit | c6586adc4c786eab63a137655ac9453bea8f2952 (patch) | |
tree | 511b0e20f78a25905e34a9aca9d9e4263c601d53 | |
parent | 9aab2699177001ff8df8cf74f323f0e2cdd4c01c (diff) | |
download | alpine_aports-c6586adc4c786eab63a137655ac9453bea8f2952.tar.bz2 alpine_aports-c6586adc4c786eab63a137655ac9453bea8f2952.tar.xz alpine_aports-c6586adc4c786eab63a137655ac9453bea8f2952.zip |
main/linux-grsec: fix kernel oops when restarting racoon
-rw-r--r-- | main/linux-grsec/APKBUILD | 4 | ||||
-rw-r--r-- | main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index f5983aa38b..a529ae86fa 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -4,7 +4,7 @@ _flavor=grsec | |||
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=2.6.32.12 | 5 | pkgver=2.6.32.12 |
6 | _kernver=2.6.32 | 6 | _kernver=2.6.32 |
7 | pkgrel=2 | 7 | pkgrel=4 |
8 | pkgdesc="Linux kernel with grsecurity" | 8 | pkgdesc="Linux kernel with grsecurity" |
9 | url=http://grsecurity.net | 9 | url=http://grsecurity.net |
10 | depends="mkinitfs linux-firmware" | 10 | depends="mkinitfs linux-firmware" |
@@ -31,6 +31,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | |||
31 | 0016-xfrm-remove-policy-garbage-collection.patch | 31 | 0016-xfrm-remove-policy-garbage-collection.patch |
32 | 0017-flow-delayed-deletion-of-flow-cache-entries.patch | 32 | 0017-flow-delayed-deletion-of-flow-cache-entries.patch |
33 | 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | 33 | 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch |
34 | xfrm-fix-policy-unreferencing-on-larval-drop.patch | ||
34 | kernelconfig.x86 | 35 | kernelconfig.x86 |
35 | " | 36 | " |
36 | subpackages="$pkgname-dev linux-firmware:firmware" | 37 | subpackages="$pkgname-dev linux-firmware:firmware" |
@@ -154,4 +155,5 @@ c09b82b89a49ba2a3836a0bc3a3312f4 0015-xfrm-cache-bundles-instead-of-policies-fo | |||
154 | 41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch | 155 | 41618efb65ab9ddacfb59a1cde9b4edd 0016-xfrm-remove-policy-garbage-collection.patch |
155 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch | 156 | 3b83f0972ab715819d1119b120a987e7 0017-flow-delayed-deletion-of-flow-cache-entries.patch |
156 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch | 157 | 45a676c7a1759fec60b724d557b4e295 0018-xfrm-Fix-crashes-in-xfrm_lookup.patch |
158 | c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.patch | ||
157 | 7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86" | 159 | 7f442049b29ab749180e54ff8f20f1d0 kernelconfig.x86" |
diff --git a/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch b/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch new file mode 100644 index 0000000000..25dc0dcdc2 --- /dev/null +++ b/main/linux-grsec/xfrm-fix-policy-unreferencing-on-larval-drop.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c | ||
2 | index 31f4ba4..f4ea3a0 100644 | ||
3 | --- a/net/xfrm/xfrm_policy.c | ||
4 | +++ b/net/xfrm/xfrm_policy.c | ||
5 | @@ -1805,7 +1805,7 @@ restart: | ||
6 | /* EREMOTE tells the caller to generate | ||
7 | * a one-shot blackhole route. */ | ||
8 | dst_release(dst); | ||
9 | - xfrm_pols_put(pols, num_pols); | ||
10 | + xfrm_pols_put(pols, drop_pols); | ||
11 | XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); | ||
12 | return -EREMOTE; | ||
13 | } | ||
14 | |||