aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/linux-vserver/APKBUILD4
-rw-r--r--main/linux-vserver/CVE-2013-2094.patch11
2 files changed, 14 insertions, 1 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 921091ec84..545f092346 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -11,7 +11,7 @@ else
_kernver=${pkgver%.*}
fi
-pkgrel=1
+pkgrel=2
pkgdesc="Linux kernel with vserver"
url="http://linux-vserver.org/"
depends="mkinitfs linux-firmware"
@@ -22,6 +22,7 @@ install=
source="http://www.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
http://www.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
http://vserver.13thfloor.at/Experimental/patch-$pkgver-$_vsver.diff
+ CVE-2013-2094.patch
kernelconfig.x86
kernelconfig.x86_64
"
@@ -134,5 +135,6 @@ dev() {
md5sums="7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2
c0f416f6a2e916633f697287cc7cb914 patch-2.6.38.8.bz2
2a0c2d21c83811f8aca6b4ebab42f654 patch-2.6.38.8-vs2.3.0.37-rc17.diff
+b4b46eacaaabea407e38f12e956b3b07 CVE-2013-2094.patch
bacde2f6f0ac4bac379d4bdfda09322a kernelconfig.x86
f409d26e7fe848308b7ddaf210bfaeb8 kernelconfig.x86_64"
diff --git a/main/linux-vserver/CVE-2013-2094.patch b/main/linux-vserver/CVE-2013-2094.patch
new file mode 100644
index 0000000000..18d8490b67
--- /dev/null
+++ b/main/linux-vserver/CVE-2013-2094.patch
@@ -0,0 +1,11 @@
+--- ./kernel/perf_event.c.orig
++++ ./kernel/perf_event.c
+@@ -4866,7 +4866,7 @@
+
+ static int perf_swevent_init(struct perf_event *event)
+ {
+- int event_id = event->attr.config;
++ u64 event_id = event->attr.config;
+
+ if (event->attr.type != PERF_TYPE_SOFTWARE)
+ return -ENOENT;