Apply all XSA patches

3 files changed, 62 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37120ba885bf..6d4006d95b47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Sep 30 21:02:35 UTC 2017
+# Sat Sep 30 21:05:56 UTC 2017
 pkgbase = xen
 	pkgdesc = Virtual Machine Hypervisor & Tools
 	pkgver = 4.9.0
@@ -48,6 +48,18 @@ pkgbase = xen
 	source = https://downloads.xenproject.org/release/xen/4.9.0/xen-4.9.0.tar.gz
 	source = https://downloads.xenproject.org/release/xen/4.9.0/xen-4.9.0.tar.gz.sig
 	source = http://xenbits.xen.org/xen-extfiles/ipxe-git-827dd1bfee67daa683935ce65316f7e0f057fe1c.tar.gz
+	source = https://xenbits.xen.org/xsa/xsa226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls.patch
+	source = https://xenbits.xen.org/xsa/xsa226-4.9/0002-gnttab-fix-transitive-grant-handling.patch
+	source = https://xenbits.xen.org/xsa/xsa227.patch
+	source = https://xenbits.xen.org/xsa/xsa228.patch
+	source = https://xenbits.xen.org/xsa/xsa230.patch
+	source = https://xenbits.xen.org/xsa/xsa231-4.9.patch
+	source = https://xenbits.xen.org/xsa/xsa232.patch
+	source = https://xenbits.xen.org/xsa/xsa233.patch
+	source = https://xenbits.xen.org/xsa/xsa234-4.9.patch
+	source = https://xenbits.xen.org/xsa/xsa235-4.9.patch
+	source = https://xenbits.xen.org/xsa/xsa245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch
+	source = https://xenbits.xen.org/xsa/xsa245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch
 	source = grub-mkconfig-helper
 	source = efi-xen.cfg
 	source = grub.conf
@@ -56,6 +68,18 @@ pkgbase = xen
 	sha256sums = cade643fe3310d4d6f97d0c215c6fa323bc1130d7e64d7e2043ffaa73a96f33b
 	sha256sums = SKIP
 	sha256sums = 36deacb946c59ad1d6600f6e5b89d6a7a8961e65eb000900e184075920120f49
+	sha256sums = 3878c27b77ba24012599289e0e0fb1e5198b1e4efe2f87f7c46def5f335f2fd5
+	sha256sums = 01d773c5bb4cafe54daf0d14e8a3af899a7c5863513d18927c4a570a74afdb15
+	sha256sums = 9923a47e5f86949800887596f098954a08ef73a01d74b1dbe16cab2e6b1fabb2
+	sha256sums = 1979e111442517891b483e316a15a760a4c992ac4440f95e361ff12f4bebff62
+	sha256sums = 77a73f1c32d083e315ef0b1bbb119cb8840ceb5ada790cad76cbfb9116f725cc
+	sha256sums = 71a53a5133c8d4e381dd0e3e54205d31dea545ab62b261084dd3aea140f88cad
+	sha256sums = 5068a78293daa58557c30c95141b775becfb650de6a5eda0d82a4a321ced551c
+	sha256sums = f721cc49ba692b2f36299b631451f51d7340b8b4732f74c98f01cb7a80d8662b
+	sha256sums = 213f9d81a4ab785db67b9f579c9e88c9c8586c46b93f466a309060750df2df32
+	sha256sums = d8f012734fbf6019c1ff864744e308c41dfb9c7804ca3be2771c2c972cdf4bd5
+	sha256sums = 526f9e1b127fbb316762ce8e8f4563bc9de0c55a1db581456a3017d570d35bdd
+	sha256sums = 7164010112fcccd9cd88e72ace2eeabdb364dd6f4d05c434686267d18067f420
 	sha256sums = 06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb
 	sha256sums = ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f
 	sha256sums = 3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568
diff --git a/ChangeLog b/ChangeLog
index c7583c46bd04..38fdb87123c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2017-09-30 Janne Heß
 	* 4.9.0-2
 	Add spice-glib dependency
+	Apply XSA patches: 226 227 228 229 230 231 232 233 234 235
 
 2017-07-20 Janne Heß
 	* 4.9.0
diff --git a/PKGBUILD b/PKGBUILD
index dddf65e68c0e..5ab8917ec69e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -99,7 +99,18 @@ source=(
 	"http://xenbits.xen.org/xen-extfiles/ipxe-git-${_git_tag_ipxe}.tar.gz"
 
 	# XSA patches
-	# None yet
+	'https://xenbits.xen.org/xsa/xsa226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls.patch'
+	'https://xenbits.xen.org/xsa/xsa226-4.9/0002-gnttab-fix-transitive-grant-handling.patch'
+	'https://xenbits.xen.org/xsa/xsa227.patch'
+	'https://xenbits.xen.org/xsa/xsa228.patch'
+	'https://xenbits.xen.org/xsa/xsa230.patch'
+	'https://xenbits.xen.org/xsa/xsa231-4.9.patch'
+	'https://xenbits.xen.org/xsa/xsa232.patch'
+	'https://xenbits.xen.org/xsa/xsa233.patch'
+	'https://xenbits.xen.org/xsa/xsa234-4.9.patch'
+	'https://xenbits.xen.org/xsa/xsa235-4.9.patch'
+	'https://xenbits.xen.org/xsa/xsa245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch'
+	'https://xenbits.xen.org/xsa/xsa245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch'
 
 	# Files
 	'grub-mkconfig-helper'
@@ -129,7 +140,19 @@ sha256sums=(
 	'36deacb946c59ad1d6600f6e5b89d6a7a8961e65eb000900e184075920120f49'
 
 	# XSA patches
-	# None yet. Last checked: XSA-225
+	'3878c27b77ba24012599289e0e0fb1e5198b1e4efe2f87f7c46def5f335f2fd5'
+	'01d773c5bb4cafe54daf0d14e8a3af899a7c5863513d18927c4a570a74afdb15'
+	'9923a47e5f86949800887596f098954a08ef73a01d74b1dbe16cab2e6b1fabb2'
+	'1979e111442517891b483e316a15a760a4c992ac4440f95e361ff12f4bebff62'
+	'77a73f1c32d083e315ef0b1bbb119cb8840ceb5ada790cad76cbfb9116f725cc'
+	'71a53a5133c8d4e381dd0e3e54205d31dea545ab62b261084dd3aea140f88cad'
+	'5068a78293daa58557c30c95141b775becfb650de6a5eda0d82a4a321ced551c'
+	'f721cc49ba692b2f36299b631451f51d7340b8b4732f74c98f01cb7a80d8662b'
+	'213f9d81a4ab785db67b9f579c9e88c9c8586c46b93f466a309060750df2df32'
+	'd8f012734fbf6019c1ff864744e308c41dfb9c7804ca3be2771c2c972cdf4bd5'
+	'526f9e1b127fbb316762ce8e8f4563bc9de0c55a1db581456a3017d570d35bdd'
+	'7164010112fcccd9cd88e72ace2eeabdb364dd6f4d05c434686267d18067f420'
+	# Last checked: XSA-245
 	# PKGBUILD files
 	'06c9f6140f7ef4ccfc4b1a7d9732a673313e269733180f53afcd9e43bf6c26bb'
 	'ceaff798a92a7aef1465a0a0b27b1817aedd2c857332b456aaa6dd78dc72438f'
@@ -180,7 +203,17 @@ prepare() {
 	# XSA Patches
 	msg2 'Applying XSA Patches...'
 	# None yet. Example:
-	#patch -Np1 -i "${srcdir}/xsa214.patch"
+	patch -Np1 -i "${srcdir}/0001-gnttab-dont-use-possibly-unbounded-tail-calls.patch"
+	patch -Np1 -i "${srcdir}/0002-gnttab-fix-transitive-grant-handling.patch"
+	patch -Np1 -i "${srcdir}/xsa227.patch"
+	patch -Np1 -i "${srcdir}/xsa228.patch"
+	patch -Np1 -i "${srcdir}/xsa230.patch"
+	patch -Np1 -i "${srcdir}/xsa231-4.9.patch"
+	patch -Np1 -i "${srcdir}/xsa232.patch"
+	patch -Np1 -i "${srcdir}/xsa233.patch"
+	patch -Np1 -i "${srcdir}/xsa234-4.9.patch"
+	patch -Np1 -i "${srcdir}/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch"
+	patch -Np1 -i "${srcdir}/0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch"
 	# qemu-xen-traditional
 	pushd 'tools/qemu-xen-traditional' >/dev/null
 	# None yet. Example: