Fix to leak in qemu-system, reported in Bug #467200 and tested by László Szalma, patch from [Qemu-devel], closes said bug

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 96 insertions, 23 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 07d131dca998..3340aff36702 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.149 2013/05/15 20:33:05 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.150 2013/05/16 05:26:22 idella4 Exp $
+
+  16 May 2013; Ian Delaney <idella4@gentoo.org>
+  +files/xen-tools-4.2-xen_disk_leak.patch, xen-tools-4.2.1-r3.ebuild,
+  xen-tools-4.2.2-r1.ebuild:
+  Fix to leak in qemu-system, reported in Bug #467200 and tested by László
+  Szalma, patch from [Qemu-devel], closes said bug
 
 *xen-tools-4.2.2-r1 (15 May 2013)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 2a1613646f0c..ac789bad1c93 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -24,6 +24,7 @@ AUX xen-tools-4.1.1-bridge.patch 449 SHA256 71eea5408e3600c3c6f7ce4e8363ea2c19db
 AUX xen-tools-4.1.1-curl.patch 550 SHA256 4bdb2875b36e7dbb0bd8d61b697da78007bb22922f56e020795c91ebb9ddd50b SHA512 d59a89a29ac687340953f48742451dcfebd94b8ede409184154d32a2371214cd8eae799240ff8a04aa0627973ea604b1461c9d937bc5ac0c86009dfa2b0875fe WHIRLPOOL 26262524f0a5cb6cb827cf65e52b3fbf86c98ab8928aa077fdc5ce5d81ee6d9a3c69d1b2fdc019560a9b0c528b318e1a0ca5c70a403b7a2627e087d43f0d9618
 AUX xen-tools-4.1.1-libxl-tap.patch 1071 SHA256 ee03a5b68a9edf5d4fe78a322ff261e13f6ded879f3898b0ea72c407f678f885 SHA512 6ce2ab4240b90d8490458747b2cc9df71a722c11987b3fa4632a7f174e4111df623a50796bf37ef5b3864a84530305de8da923525a0a7ce416942efc13d0b950 WHIRLPOOL a4bde6ea31a116b92c929eac01ec7425ec9d32c05ed1675f2bf62d96897cb6876ea8f55455c9825e8e55670afe4c6c61a99ecb24925ac93d2825903dcb617050
 AUX xen-tools-4.1.2-pyxml.patch 408 SHA256 6a8d8ca5478bc68850fd930749ca22207807c87f8624c0c3596a8cd70bc06c65 SHA512 ce6bae69e7ab1ef3cf4d9996399e1b08becd7dc18abd84724bb5c64b232354634657e3fd1acfb7953f07be4fd80f4ff1445257864a65482c6b4825ff99580faf WHIRLPOOL 888f464a910ac458fc1009908634f113181b492935a9d7651df4a81beed6b277b7b2bbc33bee300e721457a9c09723001e63f2e14c823283b1c6039cd09a7868
+AUX xen-tools-4.2-xen_disk_leak.patch 2324 SHA256 b5d07dded35d48196afe4e52e7e48ef459b527c4b34f1aad13710dae94cba6c8 SHA512 bb8a36a30e69f6d09c9293cd76f071741ce04bf0d0129d9417b3fc41841f6dcb0160506a80222e67d58c78a289072913578868d6a055eb23266d15d5fa59ebe2 WHIRLPOOL c0c69406f564b335a3215a7cea8a447ad7d2b27590f3cf92c74c74356c46ed26557fee3ff5fac5a8ae54f7d8dc1772500d75d9de1630a57ee48d8193a6fdd1e9
 AUX xenconsoled.confd 44 SHA256 2a74be03eb74f6013242a4a5d721df6cb9b959b43c405de1e32813f52d749060 SHA512 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d WHIRLPOOL 503f7b48842724e69e7e4ae752d0570c339b7214b5a5fa1db51300e65470803bb383524f6de6c5c08849a961f628f6db7764e3eddcc19accbd209777a0f27d68
 AUX xenconsoled.initd 652 SHA256 1a5594e4e924b94490c5c942b1b63e5fe857b8ad8061060e5d8a3bdfc9f0f1b7 SHA512 7caba575ecc1bb7263539142fa087ec788c583128d7c5236c1fd342d06a238edbb0aaf0ea53ce6189e72cf4402dfc07205db477840e3fa7233b3a6f9a231c2e4 WHIRLPOOL bb58d60a7ee646b59fb1272143c8fcbef191d9f4d90fb933d8789c37f7c28d6b63e81c616f870456fe84f12402753edf3af637d4fa37e425049570824035d805
 AUX xend.initd-r1 1664 SHA256 6ea8848ca1203c5ef8490014ded86ec67100385c217660d393b25dc6519d254d SHA512 ec0b1728bf60427f28f5e649bb3e67f8aa3539a1681f0cdea33d021131a84c8eecbf4caec73eda32f3face610c46aaf3f4b0585129111670569405c2cc4d2843 WHIRLPOOL db4089bd831e2b1e1d2abe8ec07bcf6d229a50f06df16de836ad3b0d0a594fc7776f514cee14ee088172a2ea611f12ee16c1d02f30be48fc9ba9fc58482b9652
@@ -42,25 +43,15 @@ DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe
 EBUILD xen-tools-4.2.0-r3.ebuild 10190 SHA256 759af2416598e871367071f7045cd4971659309459c5efd6541c4d4e920a69a0 SHA512 85cdbfc9abd901b14990b1f2952748aaa861adc9b21c6b8859a2523e8c3e62e2f677da9c20218675d3a1aedb3e70a48f5b48eeb3fb37c5389f8e091ff43c5e5e WHIRLPOOL c881d9929ab45be9baec55e863c54e32328c5f7650f6c469171e7efd10c6589d0c454afb7295b89ab7bd649de1d7c5f3d835ae527463217b56e6076c42728afb
 EBUILD xen-tools-4.2.1-r1.ebuild 10119 SHA256 d21c0bd5a1a44a7a87aa2521d9a1c9f8b569968ddf570aeae7f47bebc3c843c6 SHA512 ef77c4c08ec57970c699c09f51879f8b8dc5fc36141b3d68ad8fecce161d8810c79f7341b39c5b9944df9d1bc7e69fc85109fa9c23eb2e2d5a9e405bae652648 WHIRLPOOL 54597bf2c032718d0461017e22524f4ca1c6ab8ff55df54cd08f19f7c43d1cdc69f4a45d3aac695f34e0b67cb20186baa8aa4b2cdc3665049eb3ce52ca56a9d4
 EBUILD xen-tools-4.2.1-r2.ebuild 10256 SHA256 7a2eb13b5dce1cd71ea2ea45f6848d67e578fe531367480fbaa3ae18b3862af7 SHA512 0b79429e45747b6d1fd6da1f90807de3d97daee86b7ac76a288c6b5f08402c61f44a5f22064d749560a7decdf747114e92dcdaef1e7b0c236a59c59a4f54eddf WHIRLPOOL 5d3e42614d241fca5f2fa898c8bef6e527cd0e2967ea1a993ddb43d719158c9fe7646c1e67278c6a3444dced0be48090fb126262bcfee35baaf075d7d5251ebd
-EBUILD xen-tools-4.2.1-r3.ebuild 10387 SHA256 c81853d0530710606b83812963ed8aef5697a28b45540f5df7395e0cfc7b01a0 SHA512 0af24f43be6039eb271c5643bbd6ffcf338d6e98cda9ce8574254d19c3e9038df7a20c2d57621ca70aee1ce9214c13486961fa627448185059a09f243674a380 WHIRLPOOL 20ba9040ff6e09a1ab1431e0f072360be6b9556d27c173a3dd9e308dac7548fa432789ec579da791f1074e995cb30bd654d72c93e22aeee208f1c2e417684235
+EBUILD xen-tools-4.2.1-r3.ebuild 10436 SHA256 1f58231916fa06640214962492d133a2cfbe51322f245c6c3bc9eb58f1022c5c SHA512 b0ab902e1b86b68095156bb11e54ef2817c0d266b5c61fcc097aafcc4adcd981085d38fa81ead4e075a04accc3a47f5bcd4b5b38ad3660b35aacedd1c70b94ad WHIRLPOOL 8aaab9165d51e0dd6c2b2deff536e3ec563b17eac2acb930d0c675e4ff67551d9f1f6e5ccddaecc876c62bbc8ecddcf251f0c9ef4acd9b9d43e285a0e9eb944f
 EBUILD xen-tools-4.2.1.ebuild 10279 SHA256 763ee5f7cce3cc7e55b7e3bab4d271c03115000053c809793ec30a14ad6681a4 SHA512 c91f648bce05a476780267cf2839431e200944bb4d9379f8cd9370b91ec241df2c29d119e4b4160f4802949a03bc2b93f2c837187325d9b72f0a573d3a951e03 WHIRLPOOL 88aa1ec2beb59fa5b62f88cd711a3823dbeebfca22395d12445e587c87e1de11333c07f9e0535b0e61ccb5403d75ea562f4e4759fc7f1a81489634061e22f852
-EBUILD xen-tools-4.2.2-r1.ebuild 10259 SHA256 0e3bc8f65957171364f7eb4b46d630882f53ae2ef212b1d5273ee76dc7eccb09 SHA512 c7469398c45ec49085063d4789ac2843a63176e6bac43604e695f5da8ae065ab70e9d93cb3e8fb7f945db2c6a001967272842c84d81afc49d7941a7564d2d0d7 WHIRLPOOL ad948685450338f3261d9dd4244bb6cb09b51f518b5c880b64de7c152afc9a9998d2cb16aeba86ab065c120b400ee824b02fd589fa50043aadfb9b23fc10a546
-MISC ChangeLog 35782 SHA256 d882cd3f0f9508115e8a9d6927a5d74833bc1711d3ac79cb1841abea5b6b0768 SHA512 e07c7414c7a092b4d6beb735908324b5a32622bc852dcdbf795e79534c39e1e5ef1e065f88c891409ccaff4c2a8bb72f9020808f98b939ed329655af35d9e389 WHIRLPOOL 073955e2a39226952e61412f96d87a104c9eb613113f0dc4c76275cc6f3166d3583f166683b8ac35ca0a7942edc5acd3685609a5189e0883430ba758c465bd78
+EBUILD xen-tools-4.2.2-r1.ebuild 10309 SHA256 d38864562506b7512ff23caa2693f162cd057bb7329932bd0c0e22f9e2c2cb33 SHA512 66d4d28ef92e271641c08e57c2425947d1e65532aaeb5cbae58b5805e2726f585f8249d44322ea4085f243dc705d29f10f93c1ddea1044ef8e1e84597169a08f WHIRLPOOL c2530f996de11be4d0add6204e3a68258d1213103b17fd5d85ed4ff34358bdb01ca9c5ff687a372b4085cfd3a13ccdd6bfb97230533db6d90f8aa771a13589ca
+MISC ChangeLog 36061 SHA256 6d25a15e6a5ff0961a8422ddba273a76cdd07b7422037f447685ecb7979829be SHA512 f839a94be78fe5cfc17dedcdc8c4f6cc3ce15f08cab0136845627c60c1254a64536053752f27b70e5dbd46840e0cec30fe9b6f1da0705f9e548a2c3010ccec10 WHIRLPOOL 4679d79d4421765a73449077a05be2bed83d215c888cb16849d09979801ef8253710f1aa8c13c40f0162159be1e8fd2b3ef7dac4f96569357101a2beedf564d5
 MISC metadata.xml 881 SHA256 52d19c65a78ed979b0d6df2f83fc281e8622296e2686c199dbc58cb76a70a57b SHA512 3e2400037f840272c38b0a7b9d46f9975d512bea13e6dc21bf8458fb68b1c741f4458a9eaf18aa53c3183ef4f83e70e8ae50e28132e563fc4a1d6463c77a586d WHIRLPOOL 3b030061503f4c2beec7f51d3bf790f358a4837d78d7a0faf0eee5214832fe888445a53c0b09b94bf8dd811e44523e0bb05535d58583499df97b32280f722312
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRk/D9AAoJEEn8cBKl3gOuzJMP/3qcfdS+PhGM1M+vIKfVGBcz
-OvPTUZaPluESsD75tAViH3dHLDr/OZCwAG1R0anHI3roHIVdw0gudAbwQlYaNXuh
-Ddn/+XYH9zyEKMB7Ty0dpEhtxisUXtQ3mrXGcpyNw55nIZ0iTEKafyjTW9MxQ/lG
-Tl5RuODGvGq61UPLLE4H/pSyKjbXfahzrZQ3aaSTwrEvMF9TUfuVVvmz28K9XaPW
-3w3d6POZbs0R6EmZhm+okfZEHuHKD/HJuEphBUdtq+awkWf41RQEI/BmZ1qJsETo
-KONdm8qefNby6blzkYZ9GdLYsDI6WzR/OJrIaptniohc7XyzGY+OPOOwNtv+QH3U
-fdHpOgv8M4kr3V/C7ZblARD8DvYljR/c5/ikyGnaYw20ZlpMmcDLfy+GL/8NYHx+
-3M0uUMDcJiSIvzLUywqyNcY3H5e5FTFrEgUhYu1+Dvr2d+XBV1uVmZi9W/L5VROo
-2tcHfXGtVlo66W8ukWmMzzzYripn0Uh7K/U+3OfG4MC0WHdetPOhz5ODRqN5bO6v
-nHphzK0LPS3udriMcW0jcUIbCiQGRyNmywNQkqxEVkvzSGJcmrhZ9zAYs4R9A5vj
-Mf3xd/XoAhKqpGuKVl6kRMKFm4BMyLMcW63nF4Nt3oqSGINMXQQqOcn7iKK1CYSs
-kagsCxIFqk8ByQRO7Nck
-=xhh4
+iEYEAREIAAYFAlGUbiQACgkQso7CE7gHKw2K4ACfVPWw24KNB8OvpyHsNnY9QocF
+8RkAnRis3KuyZafTS61TWgS4DtTI2lx+
+=cEpv
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/files/xen-tools-4.2-xen_disk_leak.patch b/app-emulation/xen-tools/files/xen-tools-4.2-xen_disk_leak.patch
new file mode 100644
index 000000000000..481eb65c4302
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-4.2-xen_disk_leak.patch
@@ -0,0 +1,74 @@
+From: 	Roger Pau Monne
+Subject: 	[Qemu-devel] [PATCH RFC 2/3] xen_disk: fix memory leak
+Date: 	Mon, 31 Dec 2012 13:16:13 +0100
+
+On ioreq_release the full ioreq 
+was memset to 0, loosing all the data
+and memory allocations inside the QEMUIOVector, which leads to a
+memory leak. Create a new function to specifically reset ioreq.
+
+Reported-by: Maik Wessler <address@hidden>
+Signed-off-by: Roger Pau Monné <address@hidden>
+Cc: address@hidden
+Cc: Stefano Stabellini <address@hidden>
+Cc: Anthony PERARD <address@hidden>
+---
+ hw/xen_disk.c |   28 ++++++++++++++++++++++++++--
+ 1 files changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xen_disk.c b/hw/xen_disk.c
+index a159ee5..1eb485a 100644
+--- a/tools/qemu-xen/hw/xen_disk.c
++++ b/tools/qemu-xen/hw/xen_disk.c
+@@ -113,6 +113,31 @@ struct XenBlkDev {
+ 
+ /* ------------------------------------------------------------- */
+ 
++static void ioreq_reset(struct ioreq *ioreq)
++{
++    memset(&ioreq->req, 0, sizeof(ioreq->req));
++    ioreq->status = 0;
++    ioreq->start = 0;
++    ioreq->presync = 0;
++    ioreq->postsync = 0;
++    ioreq->mapped = 0;
++
++    memset(ioreq->domids, 0, sizeof(ioreq->domids));
++    memset(ioreq->refs, 0, sizeof(ioreq->refs));
++    ioreq->prot = 0;
++    memset(ioreq->page, 0, sizeof(ioreq->page));
++    ioreq->pages = NULL;
++
++    ioreq->aio_inflight = 0;
++    ioreq->aio_errors = 0;
++
++    ioreq->blkdev = NULL;
++    memset(&ioreq->list, 0, sizeof(ioreq->list));
++    memset(&ioreq->acct, 0, sizeof(ioreq->acct));
++
++    qemu_iovec_reset(&ioreq->v);
++}
++
+ static struct ioreq *ioreq_start(struct XenBlkDev *blkdev)
+ {
+     struct ioreq *ioreq = NULL;
+@@ -130,7 +155,6 @@ static struct ioreq *ioreq_start(struct XenBlkDev *blkdev)
+         /* get one from freelist */
+         ioreq = QLIST_FIRST(&blkdev->freelist);
+         QLIST_REMOVE(ioreq, list);
+-        qemu_iovec_reset(&ioreq->v);
+     }
+     QLIST_INSERT_HEAD(&blkdev->inflight, ioreq, list);
+     blkdev->requests_inflight++;
+@@ -154,7 +178,7 @@ static void ioreq_release(struct ioreq *ioreq, bool finish)
+     struct XenBlkDev *blkdev = ioreq->blkdev;
+ 
+     QLIST_REMOVE(ioreq, list);
+-    memset(ioreq, 0, sizeof(*ioreq));
++    ioreq_reset(ioreq);
+     ioreq->blkdev = blkdev;
+     QLIST_INSERT_HEAD(&blkdev->freelist, ioreq, list);
+     if (finish) {
+-- 
+1.7.7.5 (Apple Git-26)
+
diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild
index 015e56346ab5..2b9750101d55 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild,v 1.1 2013/05/15 17:47:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r3.ebuild,v 1.2 2013/05/16 05:26:22 idella4 Exp $
 
 EAPI=5
 
@@ -194,9 +194,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
 
 	# add missing typedef
-	epatch "${FILESDIR}"/xen-4-ulong.patch
+	epatch "${FILESDIR}"/xen-4-ulong.patch \
+		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
 
-	#Sec patch, currently valid
+	#Sec patches currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-0215-XSA-38.patch \
 		"${FILESDIR}"/xen-4-CVE-2013-1919-XSA-46.patch \
diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild
index 8acb282adaee..cca5a597617a 100644
--- a/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild,v 1.1 2013/05/15 20:33:05 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r1.ebuild,v 1.2 2013/05/16 05:26:22 idella4 Exp $
 
 EAPI=5
 
@@ -194,7 +194,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
 
 	# add missing header
-	epatch "${FILESDIR}"/xen-4-ulong.patch
+	epatch "${FILESDIR}"/xen-4-ulong.patch \
+		"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
 
 	#Sec patch, currently valid
 	epatch "${FILESDIR}"/xen-4-CVE-2012-6075-XSA-41.patch \