diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-10 09:22:43 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2010-06-10 13:27:47 +0300 |
commit | 1d5e59ca83531f0e52bd94fbc28ec1e791020ce1 (patch) | |
tree | 1fbdad66dd4c007eccc2cce05b98f1b58126c312 | |
parent | 9c54951a0024fefe80a01bba7e2a009bf369d8f6 (diff) | |
download | alpine_aports-1d5e59ca83531f0e52bd94fbc28ec1e791020ce1.tar.bz2 alpine_aports-1d5e59ca83531f0e52bd94fbc28ec1e791020ce1.tar.xz alpine_aports-1d5e59ca83531f0e52bd94fbc28ec1e791020ce1.zip |
main/linux-grsec: fix for hyper-v and PaX
(cherry picked from commit f90d28dd1c6b9515696c7a08bebd6c463e81e00b)
-rw-r--r-- | main/linux-grsec/APKBUILD | 4 | ||||
-rw-r--r-- | main/linux-grsec/hv-grsec.patch | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 16eb88ebb8..67b03001e6 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.15 | 5 | pkgver=2.6.32.15 |
6 | _kernver=2.6.32 | 6 | _kernver=2.6.32 |
7 | pkgrel=4 | 7 | pkgrel=5 |
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" |
@@ -34,6 +34,7 @@ source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 | |||
34 | r8169-fix-random-mdio_write-failures.patch | 34 | r8169-fix-random-mdio_write-failures.patch |
35 | r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | 35 | r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch |
36 | x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch | 36 | x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch |
37 | hv-grsec.patch | ||
37 | kernelconfig.x86 | 38 | kernelconfig.x86 |
38 | " | 39 | " |
39 | subpackages="$pkgname-dev linux-firmware:firmware" | 40 | subpackages="$pkgname-dev linux-firmware:firmware" |
@@ -165,4 +166,5 @@ c7e606c11c05ff03012b21c3fe0ece47 xfrm-fix-policy-unreferencing-on-larval-drop.p | |||
165 | ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch | 166 | ce4a74190febe13713bab1b886dd5bee r8169-fix-random-mdio_write-failures.patch |
166 | b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch | 167 | b41ee19f13498fb25992fd60cd1126d4 r8169-fix-mdio_read-and-update-mdio_write-according-to-hw-specs.patch |
167 | a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch | 168 | a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch |
169 | bf14850a0036d14bc6177adbdec23a17 hv-grsec.patch | ||
168 | 442d7174a9755ed7bba22ebd4918bbe5 kernelconfig.x86" | 170 | 442d7174a9755ed7bba22ebd4918bbe5 kernelconfig.x86" |
diff --git a/main/linux-grsec/hv-grsec.patch b/main/linux-grsec/hv-grsec.patch new file mode 100644 index 0000000000..6fde341990 --- /dev/null +++ b/main/linux-grsec/hv-grsec.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c | ||
2 | index b12237f..9d47edb 100644 | ||
3 | --- a/drivers/staging/hv/Hv.c | ||
4 | +++ b/drivers/staging/hv/Hv.c | ||
5 | @@ -133,7 +133,7 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output) | ||
6 | u64 hvStatus = 0; | ||
7 | u64 inputAddress = (Input) ? virt_to_phys(Input) : 0; | ||
8 | u64 outputAddress = (Output) ? virt_to_phys(Output) : 0; | ||
9 | - volatile void *hypercallPage = gHvContext.HypercallPage; | ||
10 | + volatile void *hypercallPage = ktva_ktla(gHvContext.HypercallPage); | ||
11 | |||
12 | DPRINT_DBG(VMBUS, "Hypercall <control %llx input phys %llx virt %p " | ||
13 | "output phys %llx virt %p hypercall %p>", | ||