From ebb8f0e86bee6c7d9abe11eaf63e4658aa0eb5d2 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 15 Aug 2011 23:28:49 +0200 Subject: [PATCH] [sys-kernel/linux-server] drop older, bump others to final stable --- sys-kernel/linux-server/Manifest | 56 ++---- ...user_space-incorporate-the-access_ok.patch | 122 ----------- ...rax-after-ia32-syscall-entry-tracing.patch | 50 ----- ...t-rax-for-the-syscall-number-not-eax.patch | 97 --------- ...user_space-incorporate-the-access_ok.patch | 122 ----------- ...rax-after-ia32-syscall-entry-tracing.patch | 50 ----- ...t-rax-for-the-syscall-number-not-eax.patch | 97 --------- ...01c70d8a0144ac1d038f6876c484849a74de.patch | 97 --------- ...68a513c71e35a14f66d71782d27a79a81ea6.patch | 190 ------------------ ...ca043e8391dcd719711716492063030b55ac.patch | 49 ----- .../linux-server/linux-server-2.6.33.ebuild | 14 -- .../linux-server/linux-server-2.6.34.ebuild | 11 +- .../linux-server-2.6.35-r5.ebuild | 16 -- ...6.ebuild => linux-server-2.6.35-r7.ebuild} | 7 +- .../linux-server/linux-server-2.6.36.ebuild | 2 +- .../linux-server-2.6.37-r2.ebuild | 2 +- .../linux-server-2.6.37-r3.ebuild | 2 +- .../linux-server/linux-server-2.6.37.ebuild | 2 +- .../linux-server-2.6.38-r6.ebuild | 2 +- .../linux-server/linux-server-2.6.38.ebuild | 2 +- .../linux-server-2.6.39-r1.ebuild | 2 +- .../linux-server-2.6.39-r10.ebuild | 2 +- .../linux-server-2.6.39-r8.ebuild | 2 +- .../linux-server-2.6.39-r9.ebuild | 2 +- .../linux-server/linux-server-2.6.39.ebuild | 2 +- .../linux-server/linux-server-3.0-r5.ebuild | 2 +- 26 files changed, 40 insertions(+), 962 deletions(-) delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch delete mode 100644 sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch delete mode 100644 sys-kernel/linux-server/linux-server-2.6.33.ebuild delete mode 100644 sys-kernel/linux-server/linux-server-2.6.35-r5.ebuild rename sys-kernel/linux-server/{linux-server-2.6.35-r6.ebuild => linux-server-2.6.35-r7.ebuild} (68%) diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest index 88f220c49..97123f2f3 100644 --- a/sys-kernel/linux-server/Manifest +++ b/sys-kernel/linux-server/Manifest @@ -1,23 +1,12 @@ -AUX hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch 4309 RMD160 24e106ee1c2557ae1eac8c429c7e24961c5cfa48 SHA1 80f22664c9ad9569047e46daaed939318f0e1688 SHA256 d47f0960afcf6115cfd29f3796fcf37c2affa56a6af3ccc404910e00ae7cf7f0 -AUX hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch 1896 RMD160 c1fcb7e263e20c1174adf3ed29e9f95e7a4ab80a SHA1 41e9939449f5a6ea24beb1215eaa7d70c4cb6f34 SHA256 8fc2f5114f5bf88bbd7aae38ac86255c62ab4e0f22bbefc8856aca91a5308b5c -AUX hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch 3528 RMD160 70752d7549fa514f9a58d609de4d874a69dc390d SHA1 1867b54b9abc5d89fc1bd9289aec3cff518b8df8 SHA256 72dbd679c1778a59c213e69986484553907ee03b70064c99b904c031783f904a -AUX hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch 4926 RMD160 ccbee33c6b4f8f7fcf15c23e5a27709d474ed01c SHA1 eb7abde871fa7cf3081f8e1e6a576e771203a1dc SHA256 b5c369eb8045ecb5099cb98fe513acb64d771c91ce25e133b09c33d4be236999 -AUX hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch 1896 RMD160 c1fcb7e263e20c1174adf3ed29e9f95e7a4ab80a SHA1 41e9939449f5a6ea24beb1215eaa7d70c4cb6f34 SHA256 8fc2f5114f5bf88bbd7aae38ac86255c62ab4e0f22bbefc8856aca91a5308b5c -AUX hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch 3528 RMD160 70752d7549fa514f9a58d609de4d874a69dc390d SHA1 1867b54b9abc5d89fc1bd9289aec3cff518b8df8 SHA256 72dbd679c1778a59c213e69986484553907ee03b70064c99b904c031783f904a -AUX hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch 3516 RMD160 c31766b22b3027f5b4b0f218996277a411f13766 SHA1 cb8af45fd9da0c87399c20f9d69d3ab0ef491206 SHA256 1700ad0eff433539e434b7ad23cdedab114a4a890ffbdd74e0702e6c0b52a8cf -AUX hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch 7183 RMD160 b273d7811dfdae5a1a0001c45c6b97f30966dbd0 SHA1 25f302813a544e4fabb0086c39761cb50813c6f0 SHA256 4d8ed5ca33d365d7893e50bafb26e4aacb17186161c5bc9ac2ddb469873ad1e2 -AUX hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch 1863 RMD160 5c3d72d8f1e868f664c3d4cc0ae387ecd1be7ae2 SHA1 904820df0a80e3f4fd0b2c3578eefdb5bf84a510 SHA256 87936b817f3dda8e183042a468c66958a85b1caf0743344201beaf17db36e4ff AUX linux-server-2.6.33-amd64.config 108865 RMD160 5ea4fb1a236653d20277c485d74e9d21aa21b372 SHA1 8aa40e0fe6711ba5a93a5cfa6c537c29689f04c0 SHA256 d197230bf07e8a2b1994ba8e1b8792d5d8a9c442ff6789cdba729e614b67734a AUX linux-server-2.6.33-x86.config 113048 RMD160 b218a0d4577ba824526012fee9791d907fed2f7f SHA1 be5cf1635f7fc781c6105480f8941f76f27d730a SHA256 a73b89d7baff443a5602f2a43bedfe8b43f184f0f15ae644f70600dbc9f91bd0 -DIST 2.6.33-6.tar.bz2 276326 RMD160 9d167d31046e2497cb97fb2bdb082ff01cc4d89f SHA1 fda1b3eb57fa9412b44a6d75a358014d9adc2131 SHA256 68434df72ead4b5077692a4e4e2a3cd5b77778a9e918fa01992ff446ac721fab -DIST 2.6.34-11.tar.bz2 246449 RMD160 e78f6e6e540c0ca14cedd85e9c195ca05f19207b SHA1 7d8dbadae86c36be12759cf7115d0e967ccc9916 SHA256 e69941e359dc9fa8da7b2993939033d0f494e494e4db26a61cad42c4c327ac2b -DIST 2.6.35-9.tar.bz2 262028 RMD160 f396aeadc5a5a7bd1a8ecbcf56259157c1555ccf SHA1 7fbd88f36626517e08e18fa57fa2ee08a38e0858 SHA256 94995e8df57acff81c0393dc047d8c5e430c23c815a52d1c3127ca7048fa8413 +DIST 2.6.34-12.tar.bz2 254832 RMD160 fa591f72018ff1d0e62f3f9745caa1a5c52c8792 SHA1 4ff6e81f19dac0a2697c22c25575df24a38436a5 SHA256 292444ab8934e24798d107360c7aef0db20990d98405d9e511579176997b5871 +DIST 2.6.35-10.tar.bz2 268428 RMD160 0f4958c755991aa0011d214514cd82c8942b7210 SHA1 df4d129bca3277035c7b089f161a210b9ff4d614 SHA256 7d21b068e58539d78a4ca926cb37b86d1541fab0bafd611acc017eb8c03564f0 DIST 2.6.36-3.tar.bz2 250979 RMD160 bc219c0cd3008571e46d227f146dc20e1ca58008 SHA1 26d53a405aeaab338a39877ff54c09784284cb12 SHA256 98b33fb7e66d77c50c1e628fcc5eb616233a717d41c4845d10807567a3b7145f DIST 2.6.37-4.tar.bz2 259709 RMD160 11f5adde75db85e03279ed8a7f72038dd8305a67 SHA1 7496d6fe83d8f99e8fe20064580a4ad0572e0c9a SHA256 ba69664d1fbf0df02cfe3150b2264857532640b5b8fefd550bf6b6b06950aa3f DIST 2.6.37-6.tar.bz2 267704 RMD160 d61d68f75bf33afc63e33897ef54c9b3e285da2d SHA1 210a55bf6fce7f9877d8f26e10c3b76b7f18cb09 SHA256 1914614318cd8ce2d059c76035ec0d5d91fade13f8c9949284cbca1229fc4725 DIST 2.6.38-1.tar.bz2 123888 RMD160 87cc106b23f48b8bba34d0636f348a338eb714ef SHA1 fad2476a15bb4f1cf32b6da653a499023415df26 SHA256 f13c2ec6d2c6a5a14f9d09eab8711150b36361ecd2016fdfe186ab4e121fb3f6 DIST 2.6.39-3.tar.bz2 124547 RMD160 73d8f9bf5496784e072b877d6e905f9f3489e5a2 SHA1 ebcdf1da530e9d51964da867c8f0469742f3426a SHA256 b58445d86ccc6959081b7f0ef2f288ac6742ebd44bbecc423ac574c8a53a8d4b -DIST linux-2.6.33.tar.bz2 66266488 RMD160 7f0897db8113bc17249d82d61ca41e3b91eb4664 SHA1 acc8db00f30c7dfb4f04183a88ba35a32b6f8e8d SHA256 63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6 DIST linux-2.6.34.tar.bz2 67633622 RMD160 dafd721b00c13e3652405b517b379eed10020bf4 SHA1 4188857ba71f301991dc56285f593e9c311e5824 SHA256 fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633 DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04 @@ -28,18 +17,15 @@ DIST linux-2.6.39-r8+sabayon.tar.bz2 76483459 RMD160 dd168257b37d9a96c10d22303ff DIST linux-2.6.39-r9+sabayon.tar.bz2 76486101 RMD160 e3b3f5dc1676bfda920ef38203bbd23c163a2818 SHA1 6cc8cd67aa246a7149dca014153091cf32dbb077 SHA256 48d8f864b5be3ac6e7f3f4f63d485898fd9d043d484916114d14ded8011cdfcf DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6 DIST linux-3.0-r5+sabayon.tar.bz2 77172747 RMD160 c9027b2139ae1798dccc2978d3c0f8d254f7344f SHA1 3f5d0eff30fee66b3b255874049e8a50b798303f SHA256 f886124e28f96ac08005481b162c16aab0175962557dddf0af2c0b96ca225bf4 -DIST patch-2.6.34.6.bz2 185209 RMD160 75c9a569f8c80be7c418b75f7cde444fcc0a70ff SHA1 e033e2bc4b46e7cc8ee19c07b5ad6999b4c2a52d SHA256 a62e9392ad435948ea4ea2cce12e60e042da6e6da806691936ba50bbaa0dc8cc -DIST patch-2.6.35.4.bz2 75980 RMD160 d3d050d516f6283b17d2e15075d57d6c41235254 SHA1 f17d865d5a8320d79869223049ebc36296a1dedd SHA256 03f88e20d9138fd710b338403b2fc97e43ecc34b1f6f0b0d203e03307485550e -DIST patch-2.6.35.5.bz2 115391 RMD160 8a6d0b71aa043531575203aa61ac6807532f35e8 SHA1 1267c980179fe4ab35ac7344523c4dd616d2d5a6 SHA256 94bbeb43c6bd8047fa5f42766a68879199dfdadee11bd3e8f10f1317f698b0f4 +DIST patch-2.6.34.10.bz2 383665 RMD160 c68a391711333609a0c6000c27ec2445ff14c4aa SHA1 735f9d0f515762d2fe83872ce59d0c5affaadee1 SHA256 1a7ba6692a233934fc131349ccdf19c272306d3a0b3db01046c76c4e7996d567 +DIST patch-2.6.35.14.bz2 413380 RMD160 d1ea12b9f9f1ed516e71cacbc9fdc8986200ce9b SHA1 a0f88fdb23c174911c666524bbefc04fbe93553b SHA256 57c820dfb7a587c01a90d6317c9d7e2ae1471b923970ad305c384dbb1d67b182 DIST patch-2.6.37.2.bz2 109460 RMD160 b97f329195d90638adab13525b42a3e10a44fd0a SHA1 9d006788614ce463f3693073a92b0c8b482af6b0 SHA256 3d65f2fb5f0018e8dafda4abe68d947d2ab5e21c386062cb0d6e011244a16aef DIST patch-2.6.37.3.bz2 132880 RMD160 1116504c7ea4a46053fe3a6f7dcd0a82581f9dfc SHA1 7c3d3ded2117b2602275e070d7d0a5c7ad65e7ce SHA256 af6ccb6c85db09e78a85657b1013b2aa1399ef252ce552aafcf25684e6e5ad98 DIST patch-2.6.38.6.bz2 128175 RMD160 fcafa6e7420139bded0123ffcc21ccda8709c839 SHA1 cc69f739eb5a64a11b11256b7e69139a28fb0777 SHA256 e5bafef2af12fbf47cd8bce3d65b3e10a3dff328be5d589a90a2de0d0b822fd4 DIST server-2.6.34-amd64.config 110826 RMD160 3799c0da945996b208a2f5476c695e6b2b20c830 SHA1 37444cd2391a867d0789f2e782f966c24d074734 SHA256 0e43d38e9d419af84d7f6111a77cd7141308fa242740dfcbf5bd5fd8da4cd1d8 DIST server-2.6.34-x86.config 114866 RMD160 d50e358b1d7ef5e82bfab3ebf1e08d96ab680a97 SHA1 feb788c85909884a21cf3e24bf25bd561723bc86 SHA256 0ab64dd9294d7ecd0622103c52e898ac3f3bdc66fe187f2a19f180cd9945e668 -DIST server-2.6.35-r5-amd64.config 116649 RMD160 cdf6b7f80778b67422f863323bc2af29b82dd993 SHA1 d40d3dca7c11d914cd1cd87ba4b7913aea002acf SHA256 cdf88908389dcdcf5a7550b7f06110d6f588612ad356b1d560e9d0cf609eaa92 -DIST server-2.6.35-r5-x86.config 121641 RMD160 ec930e27853aba07fec610e8d859d609a94201af SHA1 203d7191be89daffd7c829f84b9c5eed0a89e6b5 SHA256 a757eada636d38a845ccafbdc14a001cf79154d0f89e79efa880ea58b1131e3a -DIST server-2.6.35-r6-amd64.config 116649 RMD160 cdf6b7f80778b67422f863323bc2af29b82dd993 SHA1 d40d3dca7c11d914cd1cd87ba4b7913aea002acf SHA256 cdf88908389dcdcf5a7550b7f06110d6f588612ad356b1d560e9d0cf609eaa92 -DIST server-2.6.35-r6-x86.config 121641 RMD160 ec930e27853aba07fec610e8d859d609a94201af SHA1 203d7191be89daffd7c829f84b9c5eed0a89e6b5 SHA256 a757eada636d38a845ccafbdc14a001cf79154d0f89e79efa880ea58b1131e3a +DIST server-2.6.35-r7-amd64.config 116785 RMD160 bf8b122a1a1888de53a541713418c819d92c3499 SHA1 735e101d1363181f522ba42dff34028c95bbd529 SHA256 4ec2894333ef8c378b7f06bddbb7fd79ecb4cbdc35c245a0f81e1af37c7b6422 +DIST server-2.6.35-r7-x86.config 121645 RMD160 88874b95c919eda65dda0f9dec2815ef9159ea6c SHA1 53543bbf085a884d28f70f7d250708c77ae21788 SHA256 bfa3262b7bc3d60a30eba6f97c415e282026e84fc31cd85e177dd6b224d12056 DIST server-2.6.36-amd64.config 117098 RMD160 d475800a89cdf2aa38cf68a262e056d4fb87c921 SHA1 0eca5ae0ecba27ec324384f94be3a4076c2e2421 SHA256 313025fab357336b05335831dfd84c48b0921ba82ffa1f7d30b10ce1fc4f6c15 DIST server-2.6.36-x86.config 122841 RMD160 619fc9b53aef20a8573abd2317dfc098326d58bd SHA1 933406855b63112a44c7a4611d9a2c1869d688f2 SHA256 35a360ed7a07304298bc5b1893958f0fbb9e3d51ed0cbcd03fbd8020f5f9645a DIST server-2.6.37-amd64.config 120910 RMD160 ffc11870c5313e425aefbb3ec85f008663d64f12 SHA1 8ed32ada41e6d5fe6368d03d8dd35022153f7b6e SHA256 d1750e430c68ca7720d4b2fd219914c20abde40c78d9c4f21281c73a221bf263 @@ -56,19 +42,17 @@ DIST server-2.6.39-amd64.config 127272 RMD160 fa61650559b033bc1558b287236781b0ed DIST server-2.6.39-r1-amd64.config 127267 RMD160 90f94049769e409c66045dfb3b2d7955c83d63ba SHA1 ae4c394ea8b42bab0103bca65c572675812f02c1 SHA256 f080e7de76fd7e8e91ddf01bb392ed186183ef9014f90970e82395e380e817bf DIST server-2.6.39-r1-x86.config 136310 RMD160 a436c0136113372cf85e3cd632a66c44e41ebb27 SHA1 342b2442297ab43d3da876383b86b9bf15f58937 SHA256 4bb6bcfad1b592a4e10ffad48e5a84d5c9e9b998bd36fc4509cd0b35246686a6 DIST server-2.6.39-x86.config 136315 RMD160 f97ae7bddbe05c1a8fad27ab608638257880b2a2 SHA1 6a4e0ba4f80d603b84fdc60031da14b6e9795fb2 SHA256 de13943304101d10f54196f0bf44ede7e523a38f47f3855431fa10f2666edd1a -EBUILD linux-server-2.6.33.ebuild 729 RMD160 81df987369b3029448fb1b9ee276536d34c0b308 SHA1 0a25774bcae8fc5aff5313c51cd69f11531f72fd SHA256 cf82d8ebd82b0ca12e2cfdbefd5d7a5a43782ba7897cbae83dbf77e20f8499ae -EBUILD linux-server-2.6.34.ebuild 782 RMD160 5087c1b1d85cae909f1d9bdbe47de88a2fe4377e SHA1 20fb922ce477eeca14f2fec688f2a65fdef893f8 SHA256 c70a3e046fef0b06f50da8f1dc8d0c4ad6ca16a669fa7eba8a8b6e1cc3084f2d -EBUILD linux-server-2.6.35-r5.ebuild 768 RMD160 242286ece09fe24dd5a4ee4c9f4720aded7e349c SHA1 ce299681c79a8c984c0ba0df6dd429d760edbe0c SHA256 50ff86f212e7a8e928c453067934ef071500bc62a4adea7e25c5fd23a3d4d999 -EBUILD linux-server-2.6.35-r6.ebuild 376 RMD160 db2c64dc68c459fd8db06126a6d8e2b0659cd111 SHA1 9de6ccd9c3f21bf996588f6fa74324701e8ce723 SHA256 22c7adb4e1c31ec128073cbe7fd9b52e5f30f216f4bce37a5609bc614e33ce5d -EBUILD linux-server-2.6.36.ebuild 375 RMD160 f1187b6596f583f0be146c2f3952f0c9dbfe86e6 SHA1 7f719350326fb7881879b72232f8377eaeaaae34 SHA256 a14048c9291a4be16d1876b72e5f1afc4e62ddef0811b3af2982e656a7fc500a -EBUILD linux-server-2.6.37-r2.ebuild 376 RMD160 8ec873519a9620c0d8f035f47680d75eb1ce914d SHA1 c201003c7238f5963af5b4ec783778edb738ac50 SHA256 5ab0bb760eec7c42b01cf2c73c245f84c896fd49aa5c44d5d4562147782eaf4e -EBUILD linux-server-2.6.37-r3.ebuild 376 RMD160 6d7cfbc35c303029f3b739e82d36e7ad6ff9b3c1 SHA1 92252981425dd1f29cfd1062f0f07d735b05a03c SHA256 b1ed08845570a41a3a6651f45e3995ee646d2ae41bf7ea8c1a7bf8c352c5d609 -EBUILD linux-server-2.6.37.ebuild 375 RMD160 e64c685398a411cc79678db3c3fe70fbec164062 SHA1 74681e4df9eeb983c376f7edc791f4969391ea42 SHA256 2cf09ada9f286e0c2e3a4cb78b42b459a66bd1a9668b93dc64f5aa6c9af668dd -EBUILD linux-server-2.6.38-r6.ebuild 376 RMD160 c274be06553599b9bf2adaacd1c2d685cec7539f SHA1 f62cd33e5ddf59b38730101cb66db2570992a364 SHA256 97577396e3546d529f62aefbdf4c49f7c78584778a6b9ea347d213c78ec35fb6 -EBUILD linux-server-2.6.38.ebuild 375 RMD160 e82201295b6bc12b7de8bec5d5bebc87a460e586 SHA1 2b9fc8f4780eb54b1610d3145adcfa2e59425499 SHA256 f1379f481c06b1b66060daf747a3fa70520f5d758316ff8a9a16fcb90c416b6e -EBUILD linux-server-2.6.39-r1.ebuild 375 RMD160 f1187b6596f583f0be146c2f3952f0c9dbfe86e6 SHA1 7f719350326fb7881879b72232f8377eaeaaae34 SHA256 a14048c9291a4be16d1876b72e5f1afc4e62ddef0811b3af2982e656a7fc500a -EBUILD linux-server-2.6.39-r10.ebuild 384 RMD160 cd2f10bb7e8dd8f65c340ca630a87e883a69b73a SHA1 e9cefa1282b7d1a333b5252866f3131b3e80ae05 SHA256 539b5a500e0e9caa46032404cde58cdff56536027e8e1e1a44c380edbcf10b34 -EBUILD linux-server-2.6.39-r8.ebuild 384 RMD160 cd2f10bb7e8dd8f65c340ca630a87e883a69b73a SHA1 e9cefa1282b7d1a333b5252866f3131b3e80ae05 SHA256 539b5a500e0e9caa46032404cde58cdff56536027e8e1e1a44c380edbcf10b34 -EBUILD linux-server-2.6.39-r9.ebuild 384 RMD160 cd2f10bb7e8dd8f65c340ca630a87e883a69b73a SHA1 e9cefa1282b7d1a333b5252866f3131b3e80ae05 SHA256 539b5a500e0e9caa46032404cde58cdff56536027e8e1e1a44c380edbcf10b34 -EBUILD linux-server-2.6.39.ebuild 375 RMD160 f1187b6596f583f0be146c2f3952f0c9dbfe86e6 SHA1 7f719350326fb7881879b72232f8377eaeaaae34 SHA256 a14048c9291a4be16d1876b72e5f1afc4e62ddef0811b3af2982e656a7fc500a -EBUILD linux-server-3.0-r5.ebuild 415 RMD160 0ed1c179baffe4eb4ff5e7ee9e09d920788e6303 SHA1 4d5e980839fb6335245d538465e0bdf885f72b1a SHA256 f09c8e620f4ca3a39ba42ac925c30e911d666f3173bec9ccc15850c068652b17 +EBUILD linux-server-2.6.34.ebuild 397 RMD160 29712e90ce9de88b7feb223ff062632eecb2550b SHA1 87ab287bf7d4500dcf81465bbac72a9be36cc2cf SHA256 2e5f43bba08793f5bce972754f299c745c8d2f6a774c50fd878ef8dcfeb37e96 +EBUILD linux-server-2.6.35-r7.ebuild 397 RMD160 3f2042c146c176d4d5b3f94e5d3b1e02fa96bdc7 SHA1 b819d7354947382be165b82b6ef4830852ed346b SHA256 1809e8fba8c639703ace86c49ccb2d2808d5909b3fe5f52e806acf5afe2e2d13 +EBUILD linux-server-2.6.36.ebuild 369 RMD160 f9d74d7116613cf4405c90817af59b9a6adf064d SHA1 c5973803e1ca8e2fe35bcd0c8f45aa87117503a6 SHA256 6bb9121fb932842fc747a72b2e8faa82c07e5d7f2e77f7495f004005a57b5887 +EBUILD linux-server-2.6.37-r2.ebuild 370 RMD160 436f3b6b6c03be0045197b645c7bb9d234a1bc86 SHA1 426476a2c100234223ba81336ad0dfec87577353 SHA256 77587c5f055753b28d6ecf3753fc97bbc79abfe8306e4a05b843f4242e9a0b8e +EBUILD linux-server-2.6.37-r3.ebuild 370 RMD160 c30e1f82b2ede85f661a4258c4bbbbefbc17de35 SHA1 2594b664331ecc85789f2dc37f610b1422779386 SHA256 95b6959f6cf413fb98a7db3d80b4708d3a0f14b5f537fea6a787663d097a57e5 +EBUILD linux-server-2.6.37.ebuild 369 RMD160 d299d46de05e5ae9fa3935b4b7def673b3724fd2 SHA1 8f4f84aea437a1194311508b4319189f8b31d8ed SHA256 bd37eaa890fbe31bf3437319b05ba6c92f4cd3205e2a5cc449017c75dd4a79b0 +EBUILD linux-server-2.6.38-r6.ebuild 370 RMD160 dd17da59ea560e9737656e06b94cbeba0cf7423a SHA1 9c02280363955eec0bd3e5d2301dfc8a5a1cbc47 SHA256 8d5f1cbed82dce38e8b690e5f7816016f397cf187763c24952014207d8cb763c +EBUILD linux-server-2.6.38.ebuild 369 RMD160 fc013d1b4e7a58733ff31434a432d4a9cab96311 SHA1 1ace6f4f2da4652147c95be8b56041402cab3e32 SHA256 154939e68cdad2a3434ca34dd34c7f71f64bd0be7c8ee17cea05ef532c241295 +EBUILD linux-server-2.6.39-r1.ebuild 369 RMD160 f9d74d7116613cf4405c90817af59b9a6adf064d SHA1 c5973803e1ca8e2fe35bcd0c8f45aa87117503a6 SHA256 6bb9121fb932842fc747a72b2e8faa82c07e5d7f2e77f7495f004005a57b5887 +EBUILD linux-server-2.6.39-r10.ebuild 378 RMD160 dd09bc0a1c98b3fe49a6d459a632ce67cab0b167 SHA1 9fd59a165f3d407e65b24b2e55182826a767231a SHA256 5d02db1577b52fcd4e35b955e3a262a5ec704cde33ee98fd15658183ddccbb07 +EBUILD linux-server-2.6.39-r8.ebuild 378 RMD160 dd09bc0a1c98b3fe49a6d459a632ce67cab0b167 SHA1 9fd59a165f3d407e65b24b2e55182826a767231a SHA256 5d02db1577b52fcd4e35b955e3a262a5ec704cde33ee98fd15658183ddccbb07 +EBUILD linux-server-2.6.39-r9.ebuild 378 RMD160 dd09bc0a1c98b3fe49a6d459a632ce67cab0b167 SHA1 9fd59a165f3d407e65b24b2e55182826a767231a SHA256 5d02db1577b52fcd4e35b955e3a262a5ec704cde33ee98fd15658183ddccbb07 +EBUILD linux-server-2.6.39.ebuild 369 RMD160 f9d74d7116613cf4405c90817af59b9a6adf064d SHA1 c5973803e1ca8e2fe35bcd0c8f45aa87117503a6 SHA256 6bb9121fb932842fc747a72b2e8faa82c07e5d7f2e77f7495f004005a57b5887 +EBUILD linux-server-3.0-r5.ebuild 409 RMD160 b53ebbfbef224e208570648919a459ef4da74487 SHA1 1f4ec0ea633fa8c082763a6be477275e5a26581c SHA256 b8de7cecf5a4b13325150934b128a3c07cd04d166c945ae2468017416484b935 diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch b/sys-kernel/linux-server/files/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch deleted file mode 100644 index 99a093765..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- linux-2.6.33-sabayon.orig/arch/ia64/include/asm/compat.h -+++ linux-2.6.33-sabayon/arch/ia64/include/asm/compat.h -@@ -198,7 +198,7 @@ ptr_to_compat(void __user *uptr) - } - - static __inline__ void __user * --compat_alloc_user_space (long len) -+arch_compat_alloc_user_space (long len) - { - struct pt_regs *regs = task_pt_regs(current); - return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len); ---- linux-2.6.33-sabayon.orig/arch/mips/include/asm/compat.h -+++ linux-2.6.33-sabayon/arch/mips/include/asm/compat.h -@@ -144,7 +144,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = (struct pt_regs *) - ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1; ---- linux-2.6.33-sabayon.orig/arch/parisc/include/asm/compat.h -+++ linux-2.6.33-sabayon/arch/parisc/include/asm/compat.h -@@ -146,7 +146,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static __inline__ void __user *compat_alloc_user_space(long len) -+static __inline__ void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = ¤t->thread.regs; - return (void __user *)regs->gr[30]; ---- linux-2.6.33-sabayon.orig/arch/powerpc/include/asm/compat.h -+++ linux-2.6.33-sabayon/arch/powerpc/include/asm/compat.h -@@ -133,7 +133,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = current->thread.regs; - unsigned long usp = regs->gpr[1]; ---- linux-2.6.33-sabayon.orig/arch/s390/include/asm/compat.h -+++ linux-2.6.33-sabayon/arch/s390/include/asm/compat.h -@@ -180,7 +180,7 @@ static inline int is_compat_task(void) - - #endif - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - unsigned long stack; - ---- linux-2.6.33-sabayon.orig/arch/sparc/include/asm/compat.h -+++ linux-2.6.33-sabayon/arch/sparc/include/asm/compat.h -@@ -166,7 +166,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = current_thread_info()->kregs; - unsigned long usp = regs->u_regs[UREG_I6]; ---- linux-2.6.33-sabayon.orig/arch/x86/include/asm/compat.h -+++ linux-2.6.33-sabayon/arch/x86/include/asm/compat.h -@@ -204,7 +204,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = task_pt_regs(current); - return (void __user *)regs->sp - len; ---- linux-2.6.33-sabayon.orig/include/linux/compat.h -+++ linux-2.6.33-sabayon/include/linux/compat.h -@@ -353,5 +353,7 @@ asmlinkage long compat_sys_newfstatat(un - asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename, - int flags, int mode); - -+extern void __user *compat_alloc_user_space(unsigned long len); -+ - #endif /* CONFIG_COMPAT */ - #endif /* _LINUX_COMPAT_H */ ---- linux-2.6.33-sabayon.orig/kernel/compat.c -+++ linux-2.6.33-sabayon/kernel/compat.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1139,3 +1140,24 @@ compat_sys_sysinfo(struct compat_sysinfo - - return 0; - } -+ -+/* -+ * Allocate user-space memory for the duration of a single system call, -+ * in order to marshall parameters inside a compat thunk. -+ */ -+void __user *compat_alloc_user_space(unsigned long len) -+{ -+ void __user *ptr; -+ -+ /* If len would occupy more than half of the entire compat space... */ -+ if (unlikely(len > (((compat_uptr_t)~0) >> 1))) -+ return NULL; -+ -+ ptr = arch_compat_alloc_user_space(len); -+ -+ if (unlikely(!access_ok(VERIFY_WRITE, ptr, len))) -+ return NULL; -+ -+ return ptr; -+} -+EXPORT_SYMBOL_GPL(compat_alloc_user_space); diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch b/sys-kernel/linux-server/files/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch deleted file mode 100644 index f00ba7e9e..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch +++ /dev/null @@ -1,50 +0,0 @@ -From eefdca043e8391dcd719711716492063030b55ac Mon Sep 17 00:00:00 2001 -From: Roland McGrath -Date: Tue, 14 Sep 2010 12:22:58 -0700 -Subject: x86-64, compat: Retruncate rax after ia32 syscall entry tracing - -From: Roland McGrath - -commit eefdca043e8391dcd719711716492063030b55ac upstream. - -In commit d4d6715, we reopened an old hole for a 64-bit ptracer touching a -32-bit tracee in system call entry. A %rax value set via ptrace at the -entry tracing stop gets used whole as a 32-bit syscall number, while we -only check the low 32 bits for validity. - -Fix it by truncating %rax back to 32 bits after syscall_trace_enter, -in addition to testing the full 64 bits as has already been added. - -Reported-by: Ben Hawkes -Signed-off-by: Roland McGrath -Signed-off-by: H. Peter Anvin -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/ia32/ia32entry.S | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/arch/x86/ia32/ia32entry.S -+++ b/arch/x86/ia32/ia32entry.S -@@ -50,7 +50,12 @@ - /* - * Reload arg registers from stack in case ptrace changed them. - * We don't reload %eax because syscall_trace_enter() returned -- * the value it wants us to use in the table lookup. -+ * the %rax value we should see. Instead, we just truncate that -+ * value to 32 bits again as we did on entry from user mode. -+ * If it's a new value set by user_regset during entry tracing, -+ * this matches the normal truncation of the user-mode value. -+ * If it's -1 to make us punt the syscall, then (u32)-1 is still -+ * an appropriately invalid value. - */ - .macro LOAD_ARGS32 offset, _r9=0 - .if \_r9 -@@ -60,6 +65,7 @@ - movl \offset+48(%rsp),%edx - movl \offset+56(%rsp),%esi - movl \offset+64(%rsp),%edi -+ movl %eax,%eax /* zero extension */ - .endm - - .macro CFI_STARTPROC32 simple diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch b/sys-kernel/linux-server/files/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch deleted file mode 100644 index 8bf27c207..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 36d001c70d8a0144ac1d038f6876c484849a74de Mon Sep 17 00:00:00 2001 -From: H. Peter Anvin -Date: Tue, 14 Sep 2010 12:42:41 -0700 -Subject: x86-64, compat: Test %rax for the syscall number, not %eax - -From: H. Peter Anvin - -commit 36d001c70d8a0144ac1d038f6876c484849a74de upstream. - -On 64 bits, we always, by necessity, jump through the system call -table via %rax. For 32-bit system calls, in theory the system call -number is stored in %eax, and the code was testing %eax for a valid -system call number. At one point we loaded the stored value back from -the stack to enforce zero-extension, but that was removed in checkin -d4d67150165df8bf1cc05e532f6efca96f907cab. An actual 32-bit process -will not be able to introduce a non-zero-extended number, but it can -happen via ptrace. - -Instead of re-introducing the zero-extension, test what we are -actually going to use, i.e. %rax. This only adds a handful of REX -prefixes to the code. - -Reported-by: Ben Hawkes -Signed-off-by: H. Peter Anvin -Cc: Roland McGrath -Cc: Andrew Morton -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/ia32/ia32entry.S | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - ---- a/arch/x86/ia32/ia32entry.S -+++ b/arch/x86/ia32/ia32entry.S -@@ -153,7 +153,7 @@ ENTRY(ia32_sysenter_target) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - CFI_REMEMBER_STATE - jnz sysenter_tracesys -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - sysenter_do_call: - IA32_ARG_FIXUP -@@ -195,7 +195,7 @@ sysexit_from_sys_call: - movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */ - call audit_syscall_entry - movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */ -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - movl %ebx,%edi /* reload 1st syscall arg */ - movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */ -@@ -248,7 +248,7 @@ sysenter_tracesys: - call syscall_trace_enter - LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ - RESTORE_REST -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */ - jmp sysenter_do_call - CFI_ENDPROC -@@ -314,7 +314,7 @@ ENTRY(ia32_cstar_target) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - CFI_REMEMBER_STATE - jnz cstar_tracesys -- cmpl $IA32_NR_syscalls-1,%eax -+ cmpq $IA32_NR_syscalls-1,%rax - ja ia32_badsys - cstar_do_call: - IA32_ARG_FIXUP 1 -@@ -367,7 +367,7 @@ cstar_tracesys: - LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */ - RESTORE_REST - xchgl %ebp,%r9d -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */ - jmp cstar_do_call - END(ia32_cstar_target) -@@ -425,7 +425,7 @@ ENTRY(ia32_syscall) - orl $TS_COMPAT,TI_status(%r10) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - jnz ia32_tracesys -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - ia32_do_call: - IA32_ARG_FIXUP -@@ -444,7 +444,7 @@ ia32_tracesys: - call syscall_trace_enter - LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ - RESTORE_REST -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ - jmp ia32_do_call - END(ia32_syscall) diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch b/sys-kernel/linux-server/files/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch deleted file mode 100644 index 821e22ffa..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- linux-2.6.34-sabayon.orig/arch/ia64/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/arch/ia64/include/asm/compat.h 2010-09-18 17:09:30.728304722 +0200 -@@ -199,7 +199,7 @@ ptr_to_compat(void __user *uptr) - } - - static __inline__ void __user * --compat_alloc_user_space (long len) -+arch_compat_alloc_user_space (long len) - { - struct pt_regs *regs = task_pt_regs(current); - return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len); ---- linux-2.6.34-sabayon.orig/arch/mips/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/arch/mips/include/asm/compat.h 2010-09-18 17:09:30.728822831 +0200 -@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = (struct pt_regs *) - ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1; ---- linux-2.6.34-sabayon.orig/arch/parisc/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/arch/parisc/include/asm/compat.h 2010-09-18 17:09:30.728822831 +0200 -@@ -147,7 +147,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static __inline__ void __user *compat_alloc_user_space(long len) -+static __inline__ void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = ¤t->thread.regs; - return (void __user *)regs->gr[30]; ---- linux-2.6.34-sabayon.orig/arch/powerpc/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/arch/powerpc/include/asm/compat.h 2010-09-18 17:09:30.728822831 +0200 -@@ -134,7 +134,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = current->thread.regs; - unsigned long usp = regs->gpr[1]; ---- linux-2.6.34-sabayon.orig/arch/s390/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/arch/s390/include/asm/compat.h 2010-09-18 17:09:30.728822831 +0200 -@@ -181,7 +181,7 @@ static inline int is_compat_task(void) - - #endif - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - unsigned long stack; - ---- linux-2.6.34-sabayon.orig/arch/sparc/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/arch/sparc/include/asm/compat.h 2010-09-18 17:09:30.729822459 +0200 -@@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = current_thread_info()->kregs; - unsigned long usp = regs->u_regs[UREG_I6]; ---- linux-2.6.34-sabayon.orig/arch/x86/include/asm/compat.h 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/arch/x86/include/asm/compat.h 2010-09-18 17:09:30.729822459 +0200 -@@ -205,7 +205,7 @@ static inline compat_uptr_t ptr_to_compa - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = task_pt_regs(current); - return (void __user *)regs->sp - len; ---- linux-2.6.34-sabayon.orig/include/linux/compat.h 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/include/linux/compat.h 2010-09-18 17:09:30.729822459 +0200 -@@ -356,5 +356,7 @@ asmlinkage long compat_sys_newfstatat(un - asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename, - int flags, int mode); - -+extern void __user *compat_alloc_user_space(unsigned long len); -+ - #endif /* CONFIG_COMPAT */ - #endif /* _LINUX_COMPAT_H */ ---- linux-2.6.34-sabayon.orig/kernel/compat.c 2010-05-16 23:17:36.000000000 +0200 -+++ linux-2.6.34-sabayon/kernel/compat.c 2010-09-18 17:09:58.574836565 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -1140,3 +1141,24 @@ compat_sys_sysinfo(struct compat_sysinfo - - return 0; - } -+ -+/* -+ * Allocate user-space memory for the duration of a single system call, -+ * in order to marshall parameters inside a compat thunk. -+ */ -+void __user *compat_alloc_user_space(unsigned long len) -+{ -+ void __user *ptr; -+ -+ /* If len would occupy more than half of the entire compat space... */ -+ if (unlikely(len > (((compat_uptr_t)~0) >> 1))) -+ return NULL; -+ -+ ptr = arch_compat_alloc_user_space(len); -+ -+ if (unlikely(!access_ok(VERIFY_WRITE, ptr, len))) -+ return NULL; -+ -+ return ptr; -+} -+EXPORT_SYMBOL_GPL(compat_alloc_user_space); diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch b/sys-kernel/linux-server/files/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch deleted file mode 100644 index f00ba7e9e..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch +++ /dev/null @@ -1,50 +0,0 @@ -From eefdca043e8391dcd719711716492063030b55ac Mon Sep 17 00:00:00 2001 -From: Roland McGrath -Date: Tue, 14 Sep 2010 12:22:58 -0700 -Subject: x86-64, compat: Retruncate rax after ia32 syscall entry tracing - -From: Roland McGrath - -commit eefdca043e8391dcd719711716492063030b55ac upstream. - -In commit d4d6715, we reopened an old hole for a 64-bit ptracer touching a -32-bit tracee in system call entry. A %rax value set via ptrace at the -entry tracing stop gets used whole as a 32-bit syscall number, while we -only check the low 32 bits for validity. - -Fix it by truncating %rax back to 32 bits after syscall_trace_enter, -in addition to testing the full 64 bits as has already been added. - -Reported-by: Ben Hawkes -Signed-off-by: Roland McGrath -Signed-off-by: H. Peter Anvin -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/ia32/ia32entry.S | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/arch/x86/ia32/ia32entry.S -+++ b/arch/x86/ia32/ia32entry.S -@@ -50,7 +50,12 @@ - /* - * Reload arg registers from stack in case ptrace changed them. - * We don't reload %eax because syscall_trace_enter() returned -- * the value it wants us to use in the table lookup. -+ * the %rax value we should see. Instead, we just truncate that -+ * value to 32 bits again as we did on entry from user mode. -+ * If it's a new value set by user_regset during entry tracing, -+ * this matches the normal truncation of the user-mode value. -+ * If it's -1 to make us punt the syscall, then (u32)-1 is still -+ * an appropriately invalid value. - */ - .macro LOAD_ARGS32 offset, _r9=0 - .if \_r9 -@@ -60,6 +65,7 @@ - movl \offset+48(%rsp),%edx - movl \offset+56(%rsp),%esi - movl \offset+64(%rsp),%edi -+ movl %eax,%eax /* zero extension */ - .endm - - .macro CFI_STARTPROC32 simple diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch b/sys-kernel/linux-server/files/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch deleted file mode 100644 index 8bf27c207..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 36d001c70d8a0144ac1d038f6876c484849a74de Mon Sep 17 00:00:00 2001 -From: H. Peter Anvin -Date: Tue, 14 Sep 2010 12:42:41 -0700 -Subject: x86-64, compat: Test %rax for the syscall number, not %eax - -From: H. Peter Anvin - -commit 36d001c70d8a0144ac1d038f6876c484849a74de upstream. - -On 64 bits, we always, by necessity, jump through the system call -table via %rax. For 32-bit system calls, in theory the system call -number is stored in %eax, and the code was testing %eax for a valid -system call number. At one point we loaded the stored value back from -the stack to enforce zero-extension, but that was removed in checkin -d4d67150165df8bf1cc05e532f6efca96f907cab. An actual 32-bit process -will not be able to introduce a non-zero-extended number, but it can -happen via ptrace. - -Instead of re-introducing the zero-extension, test what we are -actually going to use, i.e. %rax. This only adds a handful of REX -prefixes to the code. - -Reported-by: Ben Hawkes -Signed-off-by: H. Peter Anvin -Cc: Roland McGrath -Cc: Andrew Morton -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/ia32/ia32entry.S | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - ---- a/arch/x86/ia32/ia32entry.S -+++ b/arch/x86/ia32/ia32entry.S -@@ -153,7 +153,7 @@ ENTRY(ia32_sysenter_target) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - CFI_REMEMBER_STATE - jnz sysenter_tracesys -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - sysenter_do_call: - IA32_ARG_FIXUP -@@ -195,7 +195,7 @@ sysexit_from_sys_call: - movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */ - call audit_syscall_entry - movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */ -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - movl %ebx,%edi /* reload 1st syscall arg */ - movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */ -@@ -248,7 +248,7 @@ sysenter_tracesys: - call syscall_trace_enter - LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ - RESTORE_REST -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */ - jmp sysenter_do_call - CFI_ENDPROC -@@ -314,7 +314,7 @@ ENTRY(ia32_cstar_target) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - CFI_REMEMBER_STATE - jnz cstar_tracesys -- cmpl $IA32_NR_syscalls-1,%eax -+ cmpq $IA32_NR_syscalls-1,%rax - ja ia32_badsys - cstar_do_call: - IA32_ARG_FIXUP 1 -@@ -367,7 +367,7 @@ cstar_tracesys: - LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */ - RESTORE_REST - xchgl %ebp,%r9d -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */ - jmp cstar_do_call - END(ia32_cstar_target) -@@ -425,7 +425,7 @@ ENTRY(ia32_syscall) - orl $TS_COMPAT,TI_status(%r10) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - jnz ia32_tracesys -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - ia32_do_call: - IA32_ARG_FIXUP -@@ -444,7 +444,7 @@ ia32_tracesys: - call syscall_trace_enter - LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ - RESTORE_REST -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ - jmp ia32_do_call - END(ia32_syscall) diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch b/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch deleted file mode 100644 index 15ff0ca85..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 36d001c70d8a0144ac1d038f6876c484849a74de Mon Sep 17 00:00:00 2001 -From: H. Peter Anvin -Date: Tue, 14 Sep 2010 12:42:41 -0700 -Subject: [PATCH] x86-64, compat: Test %rax for the syscall number, not %eax - -On 64 bits, we always, by necessity, jump through the system call -table via %rax. For 32-bit system calls, in theory the system call -number is stored in %eax, and the code was testing %eax for a valid -system call number. At one point we loaded the stored value back from -the stack to enforce zero-extension, but that was removed in checkin -d4d67150165df8bf1cc05e532f6efca96f907cab. An actual 32-bit process -will not be able to introduce a non-zero-extended number, but it can -happen via ptrace. - -Instead of re-introducing the zero-extension, test what we are -actually going to use, i.e. %rax. This only adds a handful of REX -prefixes to the code. - -Reported-by: Ben Hawkes -Signed-off-by: H. Peter Anvin -Cc: -Cc: Roland McGrath -Cc: Andrew Morton ---- - arch/x86/ia32/ia32entry.S | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S -index b86feab..84e3a4e 100644 ---- a/arch/x86/ia32/ia32entry.S -+++ b/arch/x86/ia32/ia32entry.S -@@ -153,7 +153,7 @@ ENTRY(ia32_sysenter_target) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - CFI_REMEMBER_STATE - jnz sysenter_tracesys -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - sysenter_do_call: - IA32_ARG_FIXUP -@@ -195,7 +195,7 @@ sysexit_from_sys_call: - movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */ - call audit_syscall_entry - movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */ -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - movl %ebx,%edi /* reload 1st syscall arg */ - movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */ -@@ -248,7 +248,7 @@ sysenter_tracesys: - call syscall_trace_enter - LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ - RESTORE_REST -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */ - jmp sysenter_do_call - CFI_ENDPROC -@@ -314,7 +314,7 @@ ENTRY(ia32_cstar_target) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - CFI_REMEMBER_STATE - jnz cstar_tracesys -- cmpl $IA32_NR_syscalls-1,%eax -+ cmpq $IA32_NR_syscalls-1,%rax - ja ia32_badsys - cstar_do_call: - IA32_ARG_FIXUP 1 -@@ -367,7 +367,7 @@ cstar_tracesys: - LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */ - RESTORE_REST - xchgl %ebp,%r9d -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */ - jmp cstar_do_call - END(ia32_cstar_target) -@@ -425,7 +425,7 @@ ENTRY(ia32_syscall) - orl $TS_COMPAT,TI_status(%r10) - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) - jnz ia32_tracesys -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja ia32_badsys - ia32_do_call: - IA32_ARG_FIXUP -@@ -444,7 +444,7 @@ ia32_tracesys: - call syscall_trace_enter - LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ - RESTORE_REST -- cmpl $(IA32_NR_syscalls-1),%eax -+ cmpq $(IA32_NR_syscalls-1),%rax - ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ - jmp ia32_do_call - END(ia32_syscall) --- -1.7.2.3 - diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch b/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch deleted file mode 100644 index 5cf6c64a5..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch +++ /dev/null @@ -1,190 +0,0 @@ -From c41d68a513c71e35a14f66d71782d27a79a81ea6 Mon Sep 17 00:00:00 2001 -From: H. Peter Anvin -Date: Tue, 7 Sep 2010 16:16:18 -0700 -Subject: [PATCH] compat: Make compat_alloc_user_space() incorporate the access_ok() - -compat_alloc_user_space() expects the caller to independently call -access_ok() to verify the returned area. A missing call could -introduce problems on some architectures. - -This patch incorporates the access_ok() check into -compat_alloc_user_space() and also adds a sanity check on the length. -The existing compat_alloc_user_space() implementations are renamed -arch_compat_alloc_user_space() and are used as part of the -implementation of the new global function. - -This patch assumes NULL will cause __get_user()/__put_user() to either -fail or access userspace on all architectures. This should be -followed by checking the return value of compat_access_user_space() -for NULL in the callers, at which time the access_ok() in the callers -can also be removed. - -Reported-by: Ben Hawkes -Signed-off-by: H. Peter Anvin -Acked-by: Benjamin Herrenschmidt -Acked-by: Chris Metcalf -Acked-by: David S. Miller -Acked-by: Ingo Molnar -Acked-by: Thomas Gleixner -Acked-by: Tony Luck -Cc: Andrew Morton -Cc: Arnd Bergmann -Cc: Fenghua Yu -Cc: H. Peter Anvin -Cc: Heiko Carstens -Cc: Helge Deller -Cc: James Bottomley -Cc: Kyle McMartin -Cc: Martin Schwidefsky -Cc: Paul Mackerras -Cc: Ralf Baechle -Cc: ---- - arch/ia64/include/asm/compat.h | 2 +- - arch/mips/include/asm/compat.h | 2 +- - arch/parisc/include/asm/compat.h | 2 +- - arch/powerpc/include/asm/compat.h | 2 +- - arch/s390/include/asm/compat.h | 2 +- - arch/sparc/include/asm/compat.h | 2 +- - arch/tile/include/asm/compat.h | 2 +- - arch/x86/include/asm/compat.h | 2 +- - include/linux/compat.h | 3 +++ - kernel/compat.c | 21 +++++++++++++++++++++ - 10 files changed, 32 insertions(+), 8 deletions(-) - -diff --git a/arch/ia64/include/asm/compat.h b/arch/ia64/include/asm/compat.h -index f90edc8..9301a28 100644 ---- a/arch/ia64/include/asm/compat.h -+++ b/arch/ia64/include/asm/compat.h -@@ -199,7 +199,7 @@ ptr_to_compat(void __user *uptr) - } - - static __inline__ void __user * --compat_alloc_user_space (long len) -+arch_compat_alloc_user_space (long len) - { - struct pt_regs *regs = task_pt_regs(current); - return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len); -diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h -index 613f691..dbc5106 100644 ---- a/arch/mips/include/asm/compat.h -+++ b/arch/mips/include/asm/compat.h -@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = (struct pt_regs *) - ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1; -diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h -index 02b77ba..efa0b60 100644 ---- a/arch/parisc/include/asm/compat.h -+++ b/arch/parisc/include/asm/compat.h -@@ -147,7 +147,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) - return (u32)(unsigned long)uptr; - } - --static __inline__ void __user *compat_alloc_user_space(long len) -+static __inline__ void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = ¤t->thread.regs; - return (void __user *)regs->gr[30]; -diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h -index 396d21a..a11d4ea 100644 ---- a/arch/powerpc/include/asm/compat.h -+++ b/arch/powerpc/include/asm/compat.h -@@ -134,7 +134,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = current->thread.regs; - unsigned long usp = regs->gpr[1]; -diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h -index 104f200..a875c2f 100644 ---- a/arch/s390/include/asm/compat.h -+++ b/arch/s390/include/asm/compat.h -@@ -181,7 +181,7 @@ static inline int is_compat_task(void) - - #endif - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - unsigned long stack; - -diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h -index 5016f76..6f57325 100644 ---- a/arch/sparc/include/asm/compat.h -+++ b/arch/sparc/include/asm/compat.h -@@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = current_thread_info()->kregs; - unsigned long usp = regs->u_regs[UREG_I6]; -diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h -index 306160e..1d9cd27 100644 ---- a/arch/x86/include/asm/compat.h -+++ b/arch/x86/include/asm/compat.h -@@ -205,7 +205,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) - return (u32)(unsigned long)uptr; - } - --static inline void __user *compat_alloc_user_space(long len) -+static inline void __user *arch_compat_alloc_user_space(long len) - { - struct pt_regs *regs = task_pt_regs(current); - return (void __user *)regs->sp - len; -diff --git a/include/linux/compat.h b/include/linux/compat.h -index 9ddc878..5778b55 100644 ---- a/include/linux/compat.h -+++ b/include/linux/compat.h -@@ -360,5 +360,8 @@ extern ssize_t compat_rw_copy_check_uvector(int type, - const struct compat_iovec __user *uvector, unsigned long nr_segs, - unsigned long fast_segs, struct iovec *fast_pointer, - struct iovec **ret_pointer); -+ -+extern void __user *compat_alloc_user_space(unsigned long len); -+ - #endif /* CONFIG_COMPAT */ - #endif /* _LINUX_COMPAT_H */ -diff --git a/kernel/compat.c b/kernel/compat.c -index e167efc..c9e2ec0 100644 ---- a/kernel/compat.c -+++ b/kernel/compat.c -@@ -1126,3 +1126,24 @@ compat_sys_sysinfo(struct compat_sysinfo __user *info) - - return 0; - } -+ -+/* -+ * Allocate user-space memory for the duration of a single system call, -+ * in order to marshall parameters inside a compat thunk. -+ */ -+void __user *compat_alloc_user_space(unsigned long len) -+{ -+ void __user *ptr; -+ -+ /* If len would occupy more than half of the entire compat space... */ -+ if (unlikely(len > (((compat_uptr_t)~0) >> 1))) -+ return NULL; -+ -+ ptr = arch_compat_alloc_user_space(len); -+ -+ if (unlikely(!access_ok(VERIFY_WRITE, ptr, len))) -+ return NULL; -+ -+ return ptr; -+} -+EXPORT_SYMBOL_GPL(compat_alloc_user_space); --- -1.7.2.3 - diff --git a/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch b/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch deleted file mode 100644 index b7fa7391a..000000000 --- a/sys-kernel/linux-server/files/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch +++ /dev/null @@ -1,49 +0,0 @@ -From eefdca043e8391dcd719711716492063030b55ac Mon Sep 17 00:00:00 2001 -From: Roland McGrath -Date: Tue, 14 Sep 2010 12:22:58 -0700 -Subject: [PATCH] x86-64, compat: Retruncate rax after ia32 syscall entry tracing - -In commit d4d6715, we reopened an old hole for a 64-bit ptracer touching a -32-bit tracee in system call entry. A %rax value set via ptrace at the -entry tracing stop gets used whole as a 32-bit syscall number, while we -only check the low 32 bits for validity. - -Fix it by truncating %rax back to 32 bits after syscall_trace_enter, -in addition to testing the full 64 bits as has already been added. - -Reported-by: Ben Hawkes -Signed-off-by: Roland McGrath -Signed-off-by: H. Peter Anvin ---- - arch/x86/ia32/ia32entry.S | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S -index 84e3a4e..518bb99 100644 ---- a/arch/x86/ia32/ia32entry.S -+++ b/arch/x86/ia32/ia32entry.S -@@ -50,7 +50,12 @@ - /* - * Reload arg registers from stack in case ptrace changed them. - * We don't reload %eax because syscall_trace_enter() returned -- * the value it wants us to use in the table lookup. -+ * the %rax value we should see. Instead, we just truncate that -+ * value to 32 bits again as we did on entry from user mode. -+ * If it's a new value set by user_regset during entry tracing, -+ * this matches the normal truncation of the user-mode value. -+ * If it's -1 to make us punt the syscall, then (u32)-1 is still -+ * an appropriately invalid value. - */ - .macro LOAD_ARGS32 offset, _r9=0 - .if \_r9 -@@ -60,6 +65,7 @@ - movl \offset+48(%rsp),%edx - movl \offset+56(%rsp),%esi - movl \offset+64(%rsp),%edi -+ movl %eax,%eax /* zero extension */ - .endm - - .macro CFI_STARTPROC32 simple --- -1.7.2.3 - diff --git a/sys-kernel/linux-server/linux-server-2.6.33.ebuild b/sys-kernel/linux-server/linux-server-2.6.33.ebuild deleted file mode 100644 index 54b54db4d..000000000 --- a/sys-kernel/linux-server/linux-server-2.6.33.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2004-2009 Sabayon Linux -# Distributed under the terms of the GNU General Public License v2 - -ETYPE="sources" -K_SABPATCHES_VER="6" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" -# Security patches for CVE-2010-3081, will be merged in next stable kernel release -K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch - ${FILESDIR}/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch - ${FILESDIR}/hotfixes/2.6.33/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch" -inherit sabayon-kernel -KEYWORDS="~amd64 ~x86" -DESCRIPTION="Official Sabayon Linux Server kernel image" -RESTRICT="mirror" diff --git a/sys-kernel/linux-server/linux-server-2.6.34.ebuild b/sys-kernel/linux-server/linux-server-2.6.34.ebuild index 8441bf8ab..97a977a5a 100644 --- a/sys-kernel/linux-server/linux-server-2.6.34.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.34.ebuild @@ -2,14 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 ETYPE="sources" -K_SABPATCHES_VER="11" -K_KERNEL_PATCH_VER="6" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_SABPATCHES_VER="12" +K_KERNEL_PATCH_VER="10" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" -# Security patches for CVE-2010-3081, will be merged in next stable kernel release -K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch - ${FILESDIR}/hotfixes/2.6.34/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch - ${FILESDIR}/hotfixes/2.6.34/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch" +K_SABKERNEL_LONGTERM="1" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" DESCRIPTION="Official Sabayon Linux Server kernel image" diff --git a/sys-kernel/linux-server/linux-server-2.6.35-r5.ebuild b/sys-kernel/linux-server/linux-server-2.6.35-r5.ebuild deleted file mode 100644 index 1d2c1a8e5..000000000 --- a/sys-kernel/linux-server/linux-server-2.6.35-r5.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2004-2010 Sabayon Linux -# Distributed under the terms of the GNU General Public License v2 - -ETYPE="sources" -K_SABPATCHES_VER="9" -K_KERNEL_PATCH_VER="4" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" -K_SABKERNEL_URI_CONFIG="yes" -# Security patches for CVE-2010-3081, will be merged in next stable kernel release -K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch - ${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch - ${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch" -inherit sabayon-kernel -KEYWORDS="~amd64 ~x86" -DESCRIPTION="Official Sabayon Linux Server kernel image" -RESTRICT="mirror" diff --git a/sys-kernel/linux-server/linux-server-2.6.35-r6.ebuild b/sys-kernel/linux-server/linux-server-2.6.35-r7.ebuild similarity index 68% rename from sys-kernel/linux-server/linux-server-2.6.35-r6.ebuild rename to sys-kernel/linux-server/linux-server-2.6.35-r7.ebuild index 7aa238dae..f320f431e 100644 --- a/sys-kernel/linux-server/linux-server-2.6.35-r6.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.35-r7.ebuild @@ -2,10 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 ETYPE="sources" -K_SABPATCHES_VER="9" -K_KERNEL_PATCH_VER="5" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_SABPATCHES_VER="10" +K_KERNEL_PATCH_VER="14" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" +K_SABKERNEL_LONGTERM="1" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" DESCRIPTION="Official Sabayon Linux Server kernel image" diff --git a/sys-kernel/linux-server/linux-server-2.6.36.ebuild b/sys-kernel/linux-server/linux-server-2.6.36.ebuild index 8ef9b9fd1..0359f8187 100644 --- a/sys-kernel/linux-server/linux-server-2.6.36.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.36.ebuild @@ -4,7 +4,7 @@ ETYPE="sources" K_SABPATCHES_VER="3" K_KERNEL_PATCH_VER="" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.37-r2.ebuild b/sys-kernel/linux-server/linux-server-2.6.37-r2.ebuild index efa547b80..c28628bba 100644 --- a/sys-kernel/linux-server/linux-server-2.6.37-r2.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.37-r2.ebuild @@ -4,7 +4,7 @@ ETYPE="sources" K_SABPATCHES_VER="6" K_KERNEL_PATCH_VER="2" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.37-r3.ebuild b/sys-kernel/linux-server/linux-server-2.6.37-r3.ebuild index 742ed2694..2287ff432 100644 --- a/sys-kernel/linux-server/linux-server-2.6.37-r3.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.37-r3.ebuild @@ -4,7 +4,7 @@ ETYPE="sources" K_SABPATCHES_VER="6" K_KERNEL_PATCH_VER="3" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.37.ebuild b/sys-kernel/linux-server/linux-server-2.6.37.ebuild index 527e5a0d4..4f7b992e7 100644 --- a/sys-kernel/linux-server/linux-server-2.6.37.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.37.ebuild @@ -4,7 +4,7 @@ ETYPE="sources" K_SABPATCHES_VER="4" K_KERNEL_PATCH_VER="" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.38-r6.ebuild b/sys-kernel/linux-server/linux-server-2.6.38-r6.ebuild index ababda302..8ba822512 100644 --- a/sys-kernel/linux-server/linux-server-2.6.38-r6.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.38-r6.ebuild @@ -4,7 +4,7 @@ ETYPE="sources" K_SABPATCHES_VER="1" K_KERNEL_PATCH_VER="6" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.38.ebuild b/sys-kernel/linux-server/linux-server-2.6.38.ebuild index fb6f07499..8289fb6f2 100644 --- a/sys-kernel/linux-server/linux-server-2.6.38.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.38.ebuild @@ -4,7 +4,7 @@ ETYPE="sources" K_SABPATCHES_VER="1" K_KERNEL_PATCH_VER="" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.39-r1.ebuild b/sys-kernel/linux-server/linux-server-2.6.39-r1.ebuild index 8ef9b9fd1..0359f8187 100644 --- a/sys-kernel/linux-server/linux-server-2.6.39-r1.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.39-r1.ebuild @@ -4,7 +4,7 @@ ETYPE="sources" K_SABPATCHES_VER="3" K_KERNEL_PATCH_VER="" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.39-r10.ebuild b/sys-kernel/linux-server/linux-server-2.6.39-r10.ebuild index d40c2b3d6..02897bf13 100644 --- a/sys-kernel/linux-server/linux-server-2.6.39-r10.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.39-r10.ebuild @@ -3,7 +3,7 @@ ETYPE="sources" K_SABKERNEL_SELF_TARBALL_NAME="sabayon" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_REQUIRED_LINUX_FIRMWARE_VER="20110604" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.39-r8.ebuild b/sys-kernel/linux-server/linux-server-2.6.39-r8.ebuild index d40c2b3d6..02897bf13 100644 --- a/sys-kernel/linux-server/linux-server-2.6.39-r8.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.39-r8.ebuild @@ -3,7 +3,7 @@ ETYPE="sources" K_SABKERNEL_SELF_TARBALL_NAME="sabayon" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_REQUIRED_LINUX_FIRMWARE_VER="20110604" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.39-r9.ebuild b/sys-kernel/linux-server/linux-server-2.6.39-r9.ebuild index d40c2b3d6..02897bf13 100644 --- a/sys-kernel/linux-server/linux-server-2.6.39-r9.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.39-r9.ebuild @@ -3,7 +3,7 @@ ETYPE="sources" K_SABKERNEL_SELF_TARBALL_NAME="sabayon" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_REQUIRED_LINUX_FIRMWARE_VER="20110604" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-2.6.39.ebuild b/sys-kernel/linux-server/linux-server-2.6.39.ebuild index 8ef9b9fd1..0359f8187 100644 --- a/sys-kernel/linux-server/linux-server-2.6.39.ebuild +++ b/sys-kernel/linux-server/linux-server-2.6.39.ebuild @@ -4,7 +4,7 @@ ETYPE="sources" K_SABPATCHES_VER="3" K_KERNEL_PATCH_VER="" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_SABKERNEL_URI_CONFIG="yes" inherit sabayon-kernel KEYWORDS="~amd64 ~x86" diff --git a/sys-kernel/linux-server/linux-server-3.0-r5.ebuild b/sys-kernel/linux-server/linux-server-3.0-r5.ebuild index db215e7d7..458f9ed0e 100644 --- a/sys-kernel/linux-server/linux-server-3.0-r5.ebuild +++ b/sys-kernel/linux-server/linux-server-3.0-r5.ebuild @@ -3,7 +3,7 @@ ETYPE="sources" K_SABKERNEL_SELF_TARBALL_NAME="sabayon" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}" +K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}" K_REQUIRED_LINUX_FIRMWARE_VER="20110709" K_SABKERNEL_FORCE_SUBLEVEL="0" inherit sabayon-kernel