fix segfault if using =glibc-2.20, bug 529076

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

4 files changed, 82 insertions, 17 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index 79678c34611e..2a5848fc6d2f 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.66 2015/03/03 09:10:33 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.67 2015/03/05 21:24:30 dlan Exp $
+
+  05 Mar 2015; Yixun Lan <dlan@gentoo.org> ceph-0.87.1.ebuild,
+  +files/ceph-0.87.1-glibc-2.20.patch:
+  fix segfault if using =glibc-2.20, bug 529076
 
 *ceph-0.93 (03 Mar 2015)
 *ceph-0.87.1 (03 Mar 2015)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index e8806adb5696..f26c38ab9b68 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX README.gentoo 693 SHA256 fa99434d4b1141086cb6c8ec20251e0fc259e6a7f8c20f0a3b93eeff750ec888 SHA512 79eefaebf0d5a0f5e36a2cb0fb1c2433c9498f4bfa99222a124c349078f47583687dff0eede2d6e64af38431b90d519dc78d4142cbad1aa7699d00ab1c3a65b6 WHIRLPOOL d16e9219a964ccfe94dd4cd950420c6405386f249ee7156569e8d79aff749606c9835e04634a39a5cbed0c72d81617d0c28410c15717af59c4c43a00572acda3
 AUX ceph-0.79-libzfs.patch 446 SHA256 bab2247437de8fa0254a97d2224ee1dba2b43393984431910ff6513795a03598 SHA512 24e3da2e47a2c4fc0eb3a9b1d7e1c9da124b138ee1f1141f50a4dacf441aa63cf8a2407edc3d8e008534800f7289c48bb9d5b0207ce2a84c335730afc6ef72da WHIRLPOOL 169a81e9b7e9dc68eab5af9b0eac9f77caee206477a944303d4428e4e20c1793a4aff161a4d312981d496079dd2aa06c9acd1366a0c57c1040b13afc59396f53
+AUX ceph-0.87.1-glibc-2.20.patch 1717 SHA256 866ca86d70907eda7155d840a24e72ba5ddf6fa807bf939e3e653ed4593d238a SHA512 d4da93e7e1ae3a761555753b4ed4cd880b68b72c0f00fc7aeb8c9c8a614a462e04502677dd46a91c4487ad6c731152bdcbf815023edf9dfd14a4d09588e7c979 WHIRLPOOL 27fa01d969aa5540e0b88c3bd6e7ff63f968060b2830c3ea6f746024b8fe8269f76aec8bce04dc44c7e1e50b6c656641cbf7ae6cb75f639f6157464705fae7f3
 AUX ceph-fix-gnustack.patch 867 SHA256 6a92074666a849de2177b4d3a68b01028f8d61dcac598a22eb0a8937cf297ea1 SHA512 bbea19531662d500c483d71d32dfb911dc62b027e1c5de3faf4c705c4c07274f00ccdcff14fcac75d2e8a2190bef82d307eeb1fe49f919a8e570f4afbfe71f6b WHIRLPOOL 6c40204c606e06cc39fe25575f620029b6d4b81eaa9c74d539d13b66ccf1a07913e56cb4c3ea60cd527d671a61371b99c2d97bee09edc6fcf25b64a22adc9bcc
 AUX ceph.confd-r1 69 SHA256 68d0b46b925fbc0e1571230c8bcc55f46beab4e575a3d964a3753534d751fe31 SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa WHIRLPOOL 0e1989d813e7e8234112f656a4e017fae521aa5f09d344ddd1f685a6afbe3afdd51adcaf979a8395ab85ae30e6526a03d8c838d10e46f674eec7651d2df43abe
 AUX ceph.initd-r1 901 SHA256 6a2e95922ab41a61a1493a7105c31940bbb6942b2c6133718c0489e8f2276f37 SHA512 d9bd98637f8aab40a98f920d65bcceaa0aa4fff0c3cbba26b388b9567e40bce54f2c29d8dbae4dc282ed4b1ade86121bd376df6fbd8b058bce47cd6a6ee4dc9e WHIRLPOOL 1cc547ef8ce6a0c5184c14497e692d43ae48193dba57c81108f3b0e386328d53fa9230cdf410d9c737486a46c8b65569005d2916bf61ff6de19874de16edea5a
@@ -19,25 +20,25 @@ EBUILD ceph-0.67.9-r1.ebuild 2812 SHA256 f0831a0c7d48ec37436287c6313600252490f7c
 EBUILD ceph-0.80.5-r1.ebuild 2930 SHA256 ab5f8db778f2220f931316df4170bbc394a8afa310bc8629363522336fd7060e SHA512 68e55cd0bded958427f507583006cab2fcdcd2c7a2dcdb1478da0fb8133a10c0b5018872723c680a2ba8d68b4583e3556d4f90835382e1c44744c3ccbd62590b WHIRLPOOL 9bf12f0f8f41c6110771c852ce5c3554ec150bd68288c810ed82d717233462625866bbc446c9b053b699be401d8ca966dcd1fd0d8646e4436a88bc0a3097393c
 EBUILD ceph-0.80.7-r1.ebuild 2938 SHA256 5f3bc83c8c47e3238ff3159834b26836e6fe123f01edc60274b8884489169ac2 SHA512 a9987c25695f04bd1695cbc0291afccd87bf4588822dc884d9ad867f65fc7565bb9fb79ff865f876e87484107eaf2d978fb1d909227209ce8875a384ad560897 WHIRLPOOL cc1372cf33ea34c735f4045343fe401d5d6bc377a92ba3380e63502c4c7c2f608f5b023ba3264595f18d4345ed3830ca4ade938d5769ee57f069783feb2c0a14
 EBUILD ceph-0.80.8.ebuild 2891 SHA256 6720d6446cd95181600f3e6ad52117b6d1df16b0323d47b47fd587a3ba651720 SHA512 01c10434d7c36e4473db97e709b26c98dec331097da98f64917e4d296e1b59064a824fdb058ab4143fa77cc6c14a68a032c220f9035b0e3bf5a89c9475fec312 WHIRLPOOL 723788f5098456ba301a41bc2a84ab9a1df5659d42f85d27b42d47a41812a0dea2b3668a61f73baf432375ee832bc1d5ccc32e0afe67283ef73b28abf79a2be7
-EBUILD ceph-0.87.1.ebuild 3158 SHA256 571f991602bac8c6cf3b9dbac34f4d8d074e1761a88ad0ba5b68e6bc7ffbdec0 SHA512 5a9092e8c0f99c60bf34d178c850c179994b674c52c404df2ca70bf54554b036b570ee4d75a89ec7b861731753a4c0a752b7fe263b47430665c2a8285546074f WHIRLPOOL f5e4c8e23b73e819cfa5a20ff7913e4516e6a98ff0e7c5c5ba63d35030e50f4996d915242092ad72294018ceb7b79a3bb9319b4689ff62e2a7f5b77299e07494
+EBUILD ceph-0.87.1.ebuild 3203 SHA256 c28dd37670d30347a3c9044c06b1d496fa930db4ef44f1f322cebad1aa29e313 SHA512 d3baeb786aedff439b9a0188ee9faf27354c29f73d3b749edf9caa9234d9d2eb8153adc6be7b459ef0a2f91037bb1001b160f84ec431e4b67bbe41c78660c837 WHIRLPOOL 28d5948b476a2d42568ad630f826557d5ee67e92be26f561dbd3a6ecde4657ecc6fbefbe960811a16bf271522aeeaf0fb611a7e65ae6716f415d878a00079e32
 EBUILD ceph-0.93.ebuild 3038 SHA256 296fabc29238406a8f976d9da4ebf414984c031c97932d37baecafc674cd9764 SHA512 4c7fce144088d7a99a7e5f2a2de8122e1b17a5c69a3f11e380863cf66ebe065349a315c2abff5dafb35bf26d325229987b15c5ae98b8945d4d61e887f0fa5741 WHIRLPOOL fdd04a3f326b8d022dede273e39400fdb6e778608f33141059d934c6648ec018cdc06754bfb03b2e58319bc8a24d2e3e9ea5f7c798fd754c8f4777a327cecac4
 EBUILD ceph-9999.ebuild 2830 SHA256 2c586ce833d1c1eb35d13c085f653d5a4de53eb2036c1eb4ed441a9d675465b6 SHA512 449ded1cb21b55bc79982076638db40e6690d795895e11bdcf7f58f8ba2e42a7b29dea76f4b4af78f2cf9934d1093819420e1b1750cd767ce2f6c7f7ccdd4636 WHIRLPOOL 6249a316ae5399ab4df52cd1231a50652d771315f8d1d5e2acf4bf9197e05437f879bb211e28f33ab8147d7af62e60c1785bcf4b0ebc54b57702fca7cdda6d75
-MISC ChangeLog 12379 SHA256 ebbf052e7efd2f7318daec409657ec879407cf58fe0f76584bc251c0c1604d87 SHA512 73ee5f490da4de5ffae9897805872dad727066bc57f78902b0e89123d0dfff5b40d602f731f9d7ec178e2119d30d38ac878666f53065aad0e6d7a08fe3de7e6a WHIRLPOOL 604c73cbab5d0293e7eb8ad53681230819f3ac266e3687bb5b959c51ccebbefecdf1807d43b04cc8ffed5f5ed1aada4fcca3ed0a77bb13b35d466b8ec8fb93e7
+MISC ChangeLog 12530 SHA256 768bebc5b17923cf0e1723c76064cbd918d2037113d3d4a64bcec6346b9d40c1 SHA512 2b22a81cbad72a49239994ec9f75fe26b71168f835f85389b970b5ea032ff7d43ce9d30a88e4db0da4de256f753e0485f90114b75d2b9edfb0480c370b9cafbd WHIRLPOOL 83c9460682d97360dd90b88d4a83e47863d07dd4409e612f16d4c46b9e6182ad82dd306f497d682a2eb2d4260cf266ef882bc7083423230b7fc4c3af1c3ad647
 MISC metadata.xml 1062 SHA256 0dbed50fc9e802118dc3aa1b8b54550d3861f60a0d2d93c67736d39da4aa163c SHA512 4d669abb6885ec1585902710450f3657ad5ca48cb385671fa83c45b74f7ec2d1a265791a749389d3fcce3232b058aa62be58beba7274811f30f0574db04bb184 WHIRLPOOL e76cf088e399d30af8f1d2416374ef21fa731139bb93e37fb618ed915f999213e28c8b5229b2219b0e1526d0767c2fc57a14ddfd939e5bab7ee16ea250fbebce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU9QniAAoJEJIMDbyqvv1VsSkQAICoMG+GQGuYit0GGe5Mk8Pj
-4s8NNKGgS8PvpGDi5laTIR4JgfihVSFQc1mtUjzyhQ66XxQMoV//FjIj/QE05Txi
-DeDk7nlv/UiqENoy0nNSk5I/RirSTOiUoU8icc17AxpDT497HZqAvj+v3qFM7DS8
-8vFjhUqQuwgfjH6rDySsFqbilmADN74HjrKSw4FocyyfHgQNL4dZsbwQKnE2xWZx
-TaKALae7d+PEg4RrLnRLe6mw8jnSFM7azP+D/G+1sfM+eNsHMgGuDrOp9P5X1ha/
-ySm6F4J94pRyWule6cF4EE5g5J2dAeHl7SeUECAs7W9OP9+eVtHtuFeDDwWG8Jnk
-c3mN+AV5hG1fVz+7tYsw4TpLbXRBt94bozSXMywHYoC++dWnWvcz2uH0Ba10+onh
-NQZtdowHB+ETsmvKZSJGA6v6Psg+nhKx4lMOIAf7GgunCc6w7ok4QmYPfz88lTVe
-oIAfiBR3wYcIPE9YoZhp3KvYEMCUNJqvf7isMeIFqWYKfFyISxlNNdf5OqOXUedy
-vtIJdwbxYdGzodONP+rZeUsPXnkNM3RDWuszdLXRq4lKlFj93Hd1/rsCpUij+u/5
-7xfumbJS5P2LYf2qWAAad+m0QZGfFc5KjuMmbGKuUtaqxKM/XPiUz6mI5gVAKA9m
-DkJ7CFLKbaNK8KdF8JdY
-=FuBt
+iQIcBAEBCAAGBQJU+MmaAAoJEJIMDbyqvv1VrjEP/1+cZH+PxL0fq1CFIG3Y/c0o
+YtYP8dXM2wHCvf/VCUUhED4WV3YZZduQSVGPQqh24h94hh5Edi9hK5P3vqFttmHD
+3DtTwoczp71OJ+WTdOF5kBPiGVbkSF6+42+eggXe2ljaWCLYu4zI+K28a92h160Z
+MarveUns3He5ppZmO8yrUqxOVQNRxENq/mzdOGw8jVXmSaPnDl6J3r4ChOCFyn7c
+lsLkY3sC5uEwbRhdyFDg4w4BTvh6n9zTVknLgZzpDigkyDJCRWPecE4J9GJVs+4+
+lZzMq3nwSc5+H0mNSdrz+mGuXm3w6S1L6tjE4pDxRYL70QsI5FVQ/lIRT5aDp5Hk
+kV6fLDRebVFV/fR82+MK8RplmC0X+5oVvKWYgBdqyvHprjTS2wWNVpfwKplpHSFc
+DNoNK7L0yF/LOEgm0o5LIqL/6AI7P4Mu+TeIBVz/tL7B7EGAAvjDVxrPrN+TBkF4
++iIRKlS8jWh1Q6f9uK4voPVjYMedFr8iH1RQwhewYm7sCO4nKx8L9y7uZwMakT1W
+aQYcpYhbTi/AobyyZpXW6b4y0M90ahR2WFu1vYxwwUmJKbPGGuyfU2pvFnmahUho
+RGr9y5SQFmiDqejXZfZ2/tRWLmqMEpG3qfKi/bLcK0KEiYcquT6eyi3Kw2OTo0xL
+3cFHkWi6lx04/NCacIyP
+=Nfw0
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.87.1.ebuild b/sys-cluster/ceph/ceph-0.87.1.ebuild
index 679748965b36..d496d0e2ff4a 100644
--- a/sys-cluster/ceph/ceph-0.87.1.ebuild
+++ b/sys-cluster/ceph/ceph-0.87.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.87.1.ebuild,v 1.1 2015/03/03 09:10:33 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.87.1.ebuild,v 1.2 2015/03/05 21:24:30 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -74,6 +74,7 @@ REQUIRED_USE="
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-0.87.1-glibc-2.20.patch
 	"${FILESDIR}"/${PN}-0.79-libzfs.patch
 )
 
diff --git a/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch b/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch
new file mode 100644
index 000000000000..55a49d72f687
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch
@@ -0,0 +1,59 @@
+From cf2104d4d991361c53f6e2fea93b69de10cd654b Mon Sep 17 00:00:00 2001
+From: Federico Simoncelli <fsimonce@redhat.com>
+Date: Sat, 15 Nov 2014 14:14:04 +0000
+Subject: [PATCH] common: do not unlock rwlock on destruction
+
+According to pthread_rwlock_unlock(3p):
+
+ Results are undefined if the read-write lock rwlock is not held
+ by the calling thread.
+
+and:
+
+ https://sourceware.org/bugzilla/show_bug.cgi?id=17561
+
+ Calling pthread_rwlock_unlock on an rwlock which is not locked
+ is undefined.
+
+calling pthread_rwlock_unlock on RWLock destruction could cause
+an unknown behavior for two reasons:
+
+- the lock is acquired by another thread (undefined)
+- the lock is not acquired (undefined)
+
+Moreover since glibc-2.20 calling pthread_rwlock_unlock on a
+rwlock that is not locked results in a SIGILL that kills the
+application.
+
+This patch removes the pthread_rwlock_unlock call on destruction
+and replaces it with an assertion to check that the RWLock is
+not in use.
+
+Any code that relied on the implicit release is now going to
+break the assertion, e.g.:
+
+ {
+   RWLock l;
+   l.get(for_write);
+ } // implicit release, wrong.
+
+Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
+---
+ src/common/RWLock.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/RWLock.h b/src/common/RWLock.h
+index e647e17..6f0ab8e 100644
+--- a/src/common/RWLock.h
++++ b/src/common/RWLock.h
+@@ -46,7 +46,9 @@ class RWLock
+     return (nwlock.read() > 0);
+   }
+   virtual ~RWLock() {
+-    pthread_rwlock_unlock(&L);
++    // The following check is racy but we are about to destroy
++    // the object and we assume that there are no other users.
++    assert(!is_locked());
+     pthread_rwlock_destroy(&L);
+   }
+