Add patch from FreeBSD-SA-12:08.linux

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 41 insertions, 7 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 307ffb0ada61..ffc443e6561a 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.78 2012/11/24 11:30:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.79 2012/12/03 11:31:31 naota Exp $
+
+*freebsd-sources-9.0-r5 (03 Dec 2012)
+
+  03 Dec 2012;  <naota@gentoo.org> +files/freebsd-sources-cve-2012-4576.patch,
+  +freebsd-sources-9.0-r5.ebuild, -freebsd-sources-9.0-r4.ebuild:
+  Add patch from FreeBSD-SA-12:08.linux
 
   24 Nov 2012; Alexis Ballier <aballier@gentoo.org>
   freebsd-sources-9.1_rc3.ebuild, files/freebsd-sources-9.1-gentoo.patch:
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 8ce798b00a9e..01c91b9aae12 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -32,6 +32,7 @@ AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
 AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
+AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
 DIST freebsd-sys-7.2.tar.bz2 23005928 SHA256 38e1fc670b8438be42947b1512ca7d10b0f8c62c58d3234afd8ce2e55b6cae11 SHA512 1f252ded6229b263e4586ea805e6f198b3a47a0f6bc21cde482eaf1ab31c33d55aa4b12d3a6d1de6e8f4b45134351818b567262f9b1f54b64884ab19e84a87d3 WHIRLPOOL 10f6fc46b2b576f21af7e674468e91e397f0b7027a0957a412fc901c00e7b91adc05f197b9056f379793ff9628743d9441424f55e233db6de864ae8a2884b50a
 DIST freebsd-sys-8.0.tar.bz2 22552771 SHA256 2d822bdeecbbea660aea06ba147a23878cbae7f0640b0b822552d6fa1836d8c9 SHA512 dd80779c5c612c2fbf072ecbf4b965f8efe4cd782a334adc2f03c6c5477cc0ba1aded3f4fda2c7d793d633a2d490c3e7b216180a00500490ed9610c86b6905a6 WHIRLPOOL fd6d965ad01b6fd8eda3fa4859f37e12f9670e65e5556e3ff5939c32cade95b53e88d3a6d1fc3e2b593d557e38c1db8baa5e1e815bf800c7c0be644f315e8ab0
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
@@ -42,16 +43,26 @@ DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8
 EBUILD freebsd-sources-7.2-r3.ebuild 3943 SHA256 f6b279fd482a0b156924fc23fbb7a110b156d7c61a583e25817c1afa3f48b3a8 SHA512 ee770ebee1b9c9ae6f32dfe0e653b29dfed36c1db3c367d631839c4898d633e662bdf12a1d9f7cff4f4dfb64e8be4ea83269aedee4a958108a6d715c828c97aa WHIRLPOOL bbc5234cc8ade99526c8bb15e33de2c4e920722b549d7e6e910e5551249e34f75d63cffe201ce9aed53a9cb3f582bb4f5fd27713f6a76485f2a35232fd6d4853
 EBUILD freebsd-sources-8.0.ebuild 3671 SHA256 4b9c2b8f9a800697543e942138914a7784f3e111dc33db7dfe8daa31c37b3262 SHA512 89a9b735d64b24e192e546154d066d7ad4492054bc1c5079b64eae01c7ec992295d911a4fe55ea05a77885a4549775a3d85e1ed4f6d87560db1509bd2ed28b43 WHIRLPOOL 7be82aae09e023fc1cb25fb8f9ebee963c5874d2223e75fef878d167d7df967ee9356a710666a6f563ebf377e18cace1eab1017f7778f69bc23a63e59d54f883
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
-EBUILD freebsd-sources-9.0-r4.ebuild 3452 SHA256 b69418e11c38e8a9e547421b570ec38c541d60d820795dd01c7a3d0e46ecc606 SHA512 9271ffbd85b0c1cc26ba32c8a50f0dc58e0252d22e630095b8f89d30e6706314e0c606c970b75084c13b7e0ef57228deac6f69e284327b4f6128d66756f9c333 WHIRLPOOL 10e184efc4b149bce360ebc1f8be2a68f9a0d02ecfc7c7de5a768b6ced1cd771bc6707623c3ad5dbe5752baeb05d9c89a82d52a2d9a28fac6a97d4e8f5bd6bb6
+EBUILD freebsd-sources-9.0-r5.ebuild 3500 SHA256 9c08ac66025fd0dff16233546f408581e92f0c9c77fd9d803668cd451d86b4a5 SHA512 90e7cef893c4e096e916eceff6b4263330c20cc11ac0f7469e9f190c4e0aea0f781ed604cee9b3956b774389b7c4ae5776fadbb4400e8efb4aa8416ac528d3ff WHIRLPOOL 0e11564b0bd7e6978a03e96600d4ab32b7d07f197c7ba98374c1785dd1e7e65b60061770505d208b59472696a80b107b5f2e73612897ca8d94330e9b4a40ffaa
 EBUILD freebsd-sources-9.1_rc1.ebuild 3356 SHA256 aa973cc4d514a65aed559ce0913bc82461a96b506a7eeef72b39b5de52038190 SHA512 6fb6275e93aec000e9ad5cdb237b16a8d23c43d1b36873775817fc730bbc07b09e0a65f4038b87dce1d39cfee9713fd52b44e3b41c989c7776c99f3fdf0669c6 WHIRLPOOL 4b370a0ae98608b383b0ef0fc7a42903dc8e99d49603cda9c0c4da2bbd115d5376c59ab9bb45b6a88ca38a61d3d0af6badc3bb41368a085aaae76993ca95e769
 EBUILD freebsd-sources-9.1_rc2.ebuild 3356 SHA256 ff3e9b680124ffa080317346a23b62b8423c7098b738c6fb4f2a8719f98c676d SHA512 d755e72f391c99a39f58f9bdd8908fe7c8097653265bf45d2dbe1e48f9dd62cef3c776f7e58a065f5569862d9891f74a86ebecba8d22b5d820d16d8b96abcd91 WHIRLPOOL 1d0d1d08b8f3ab3949d1d559c6d07aa231c3306ea51f1bc3451f6a3307a5f62a8e602296e1818b810fa279f0a5144735cdd76cd5c348f2b6aa2280df6b564750
 EBUILD freebsd-sources-9.1_rc3.ebuild 2981 SHA256 ea8397ae10cb09e9f7dadb7a2924f1e51829440ca4b6950c5e699e5a2320aabc SHA512 e821b684756773135f5ac2e9826d834b7d984a287884cdc0fd8d75e11d2e8874439157f10df3b45c99c06141aef25892547052f19288939882b281011ec8ad91 WHIRLPOOL 8838367f12d6cccbf8940543765d0f66be8ae25b68e0865fcf1cf2cebb7cbef32d56be43694214e2f4e224dbfc214e96d99145a40cfa733ef8f69e8e58d7715f
-MISC ChangeLog 20619 SHA256 02eb093c6b492458c0484f14c57d46fc8fb87cc069975160496d92f68838380f SHA512 415159bde1529f5d3c1ad4d64d52eb78f911ffe9d9846e514d89db818355486852d83663d8ef143112a2bf28436c1298456718916832197d50d0ee2954b3924e WHIRLPOOL 5edd2ecdb5c8bfd90b67e361c7af52a7fcb50446bd49196cbb06c6695b8ac1ce6c3f36205db94f17b14494dac7f7db2cb61044eb501fb23f3981018362b1039c
+MISC ChangeLog 20841 SHA256 a5eac195fc702deed2692284182ef05c3908bb4f60ebbd93eaf03deaf1d1f3fc SHA512 21de8ad859c31c7cc4609e7e3d7b157c1e79b6fe4b3e16f75c6b08179e63a637de22b62b29326ccb2651ca57d2f86aadba678d50ae4f9ea4cadb2a8c37cab8e3 WHIRLPOOL 6a1d17950aa2d3633b3ca68bb155b0dbb95aed498f2972e244b0a3beea37296ff3e8dd7dde6d0d3f31be5d41d14ea6a3c96e8862218aaa99e7fedd6d40198bc3
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCwr/IACgkQvFcC4BYPU0rOtACfQWVamxaZhTyWmN+6VUiKvzXf
-9GsAn2MPUmGwCb1iLcSFxBBVEGqoYABf
-=wBgG
+iQIcBAEBCAAGBQJQvI2cAAoJEDYO1FT4VRUU9b0P+wRvG+dN28IaDLR3GFVVDcnz
+W/0qLAywVkL8ZmSyz3jZn/D9BvaLok/5nDhP6qTAEehEG34Jg5QlW65Aumyf4MCI
+nigKCqJIBwSqCKqaUjvjx07R09ynVeR9KGf/xXOAtqOcideNEIj6GCPHCnHhl6iJ
+8o/i4y2aMcyPkazTFkf/ShfR2EMiTGXm2FX1z8M/AHTm4gbUKKez1G+E/oFioFQ2
+R7NnsD+lVjwxkcDY9eSUmRpQues/DaqdNpVeb/6+76ObYEym63yP1uGOnxuwBdAi
+sb++eJ2oUuhdtpUpwECpwX6WuY16Z6pS87mIiJ6iG5huFjDMUl9CCIywz5vs7X1m
+OXeouG5+DEYedgyDH3vKKnvb9Jk48WH4J4+GRJGUNPWpPQL4bZgVGYOxKoVVw0xg
+2JOPY1NJJjqSq3k/6IHZY9ILNcuiy2mJklLTRct5egaPVkauFw6vimRs+OA0fwrO
+Tf/NieLB51cIz64TnqgxYnKmNt1IFD6xXKpd9X3WdKgreskWc0826402GItnhzKy
+gbM/rcopzbNaJyO/KbnLnxCrbWt11WYmJ/JTBs/olj1a1RHx4RlbNDxBDX+it7nE
+1KnbZDRHWi5jmovYQouQjDAqv8p1gX0c49QkK2Hkp1tvduA30TP5J7SuNW0HQuTg
+yOFNhfAG3C25BEpVRwOn
+=1bxQ
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch
new file mode 100644
index 000000000000..08110d60fa02
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch
@@ -0,0 +1,16 @@
+Index: sys/compat/linux/linux_ioctl.c
+===================================================================
+--- sys/compat/linux/linux_ioctl.c	(revision 242578)
++++ sys/compat/linux/linux_ioctl.c	(working copy)
+@@ -2260,8 +2260,9 @@ again:
+ 
+ 	ifc.ifc_len = valid_len; 
+ 	sbuf_finish(sb);
+-	memcpy(PTRIN(ifc.ifc_buf), sbuf_data(sb), ifc.ifc_len);
+-	error = copyout(&ifc, uifc, sizeof(ifc));
++	error = copyout(sbuf_data(sb), PTRIN(ifc.ifc_buf), ifc.ifc_len);
++	if (error == 0)
++		error = copyout(&ifc, uifc, sizeof(ifc));
+ 	sbuf_delete(sb);
+ 	CURVNET_RESTORE();
+ 
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild
index 1198b304ee30..5e956edb72bb 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r4.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r4.ebuild,v 1.1 2012/06/27 10:29:23 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r5.ebuild,v 1.1 2012/12/03 11:31:31 naota Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
@@ -63,6 +63,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-cve-2012-0217.patch"
 	epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.patch"
+	epatch "${FILESDIR}/${PN}-cve-2012-4576.patch"
 }
 
 src_compile() {