Fix file creation mode running as suid

Package-Manager: portage-2.1.4_rc10

4 files changed, 43 insertions, 10 deletions

diff --git a/sys-fs/ecryptfs-utils/ChangeLog b/sys-fs/ecryptfs-utils/ChangeLog
index 2efc743a0d41..b8244f86e345 100644
--- a/sys-fs/ecryptfs-utils/ChangeLog
+++ b/sys-fs/ecryptfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/ecryptfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.14 2007/12/14 18:14:21 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ChangeLog,v 1.15 2007/12/14 19:12:36 alonbl Exp $
+
+  14 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/ecryptfs-utils-33-suid.patch, ecryptfs-utils-33.ebuild:
+  Fix file creation mode running as suid
 
 *ecryptfs-utils-33 (14 Dec 2007)
 
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index b556746a8548..6cf820ab5e11 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -2,15 +2,19 @@ AUX ecryptfs-utils-33-mkdir.patch 2919 RMD160 2e82755e4e62a0f4a4a91b53a43d938eff
 MD5 5ff08167280ced8b0e3774e401ca74eb files/ecryptfs-utils-33-mkdir.patch 2919
 RMD160 2e82755e4e62a0f4a4a91b53a43d938eff9abc07 files/ecryptfs-utils-33-mkdir.patch 2919
 SHA256 8b080a005b3846b30abf179c76d2f453c65f8c8f86cd6afb0b00c0439b705a5d files/ecryptfs-utils-33-mkdir.patch 2919
+AUX ecryptfs-utils-33-suid.patch 896 RMD160 2239a32f588428c8497fd62353ff4ea0f183cd7a SHA1 c04dd82fd60341043a0f94fbcdb8feaeca2fcee3 SHA256 6f19d113d277f5f7ab67653c508a03f66c0e9b0b48035d84c6abcdd6d088aa22
+MD5 91a815a6e8a0256134ad104663db52d8 files/ecryptfs-utils-33-suid.patch 896
+RMD160 2239a32f588428c8497fd62353ff4ea0f183cd7a files/ecryptfs-utils-33-suid.patch 896
+SHA256 6f19d113d277f5f7ab67653c508a03f66c0e9b0b48035d84c6abcdd6d088aa22 files/ecryptfs-utils-33-suid.patch 896
 DIST ecryptfs-utils-33.tar.bz2 963259 RMD160 6756752a5a4ce397a9f4f418b8a45d978d464a91 SHA1 c4b5da9e0fa9d22e38c63d65b976bd226cd67e2e SHA256 2e16fb9f25cac32e720aa18386ab041325f20b46283afa3f46b25f33713d046a
-EBUILD ecryptfs-utils-33.ebuild 1487 RMD160 14a8506453006442b7bcde14082b0355318d8847 SHA1 2174d6f24f441d6a538a7696c3386414f5398c7c SHA256 da4c4ec8cde19fd73558f6545049d1a7264ae2bfe45d02c16de9173d853be10f
-MD5 743f18ac96e82be5ae09461a92cbaf24 ecryptfs-utils-33.ebuild 1487
-RMD160 14a8506453006442b7bcde14082b0355318d8847 ecryptfs-utils-33.ebuild 1487
-SHA256 da4c4ec8cde19fd73558f6545049d1a7264ae2bfe45d02c16de9173d853be10f ecryptfs-utils-33.ebuild 1487
-MISC ChangeLog 2571 RMD160 292e9cfd051996780a15a816bc15f92e15cacf39 SHA1 081af3c48b4dcdaf88eefdf6b3d57092ef4165e9 SHA256 05ce36a1363fb2bf49b9691f7f1f05ff5aa7635cbb12b45d12c2d4b99e262f84
-MD5 996ecaaf85178e6e69be57c60d435beb ChangeLog 2571
-RMD160 292e9cfd051996780a15a816bc15f92e15cacf39 ChangeLog 2571
-SHA256 05ce36a1363fb2bf49b9691f7f1f05ff5aa7635cbb12b45d12c2d4b99e262f84 ChangeLog 2571
+EBUILD ecryptfs-utils-33.ebuild 1525 RMD160 75ab68cd4097fead52084bdab3d64901daca294a SHA1 dbf8ce0f37446b32b75cae02c9e455edbdef4268 SHA256 e24bc2088bd03545d20787383151d6a366508912116c56af51de3071264501aa
+MD5 c4bbe7e620af51f779aca2e18670827b ecryptfs-utils-33.ebuild 1525
+RMD160 75ab68cd4097fead52084bdab3d64901daca294a ecryptfs-utils-33.ebuild 1525
+SHA256 e24bc2088bd03545d20787383151d6a366508912116c56af51de3071264501aa ecryptfs-utils-33.ebuild 1525
+MISC ChangeLog 2726 RMD160 df2e4d8b68d7622a1afff22ff3bdcf37fb14430e SHA1 ec4ba68afb934f2fe37f78c353441ef09e98faf0 SHA256 3b5853da8f18a417bac2e7adf45e52d70d1e623b4836037ca666e6ad970c11e1
+MD5 140cbd46383e208dceb22d68df0efb70 ChangeLog 2726
+RMD160 df2e4d8b68d7622a1afff22ff3bdcf37fb14430e ChangeLog 2726
+SHA256 3b5853da8f18a417bac2e7adf45e52d70d1e623b4836037ca666e6ad970c11e1 ChangeLog 2726
 MISC metadata.xml 355 RMD160 946429bdab5657b6da3ea97fd8f0feb98626facf SHA1 ffba9e7b0465df8b8ca111de7ee3b3f763c1b45e SHA256 1999eec5aaca15194f0247836f7490efda75ff3e5bc45b550f004cdc94033bee
 MD5 1c8677910988959bdc24fbca34b9f94a metadata.xml 355
 RMD160 946429bdab5657b6da3ea97fd8f0feb98626facf metadata.xml 355
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild
index dad91491d2c5..4a5275412ee5 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild,v 1.1 2007/12/14 18:14:21 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ecryptfs-utils/ecryptfs-utils-33.ebuild,v 1.2 2007/12/14 19:12:36 alonbl Exp $
 
 inherit eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-mkdir.patch"
+	epatch "${FILESDIR}/${P}-suid.patch"
 }
 
 src_compile() {
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-suid.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-suid.patch
new file mode 100644
index 000000000000..979d5d04b240
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-33-suid.patch
@@ -0,0 +1,24 @@
+diff --git a/src/libecryptfs/key_management.c b/src/libecryptfs/key_management.c
+index acedc26..2c88357 100644
+--- a/src/libecryptfs/key_management.c
++++ b/src/libecryptfs/key_management.c
+@@ -486,6 +486,7 @@ int ecryptfs_append_sig(char *auth_tok_sig, char *sig_cache_filename)
+ 		rc = -EIO;
+ 		goto out;
+ 	}
++	fchown(fd, getuid(), getgid());
+ 	lseek(fd, 0, SEEK_END);
+ 	memcpy(tmp, auth_tok_sig, ECRYPTFS_SIG_SIZE_HEX);
+ 	tmp[ECRYPTFS_SIG_SIZE_HEX] = '\n';
+diff --git a/src/utils/mount.ecryptfs.c b/src/utils/mount.ecryptfs.c
+index 4e14795..86d15ac 100644
+--- a/src/utils/mount.ecryptfs.c
++++ b/src/utils/mount.ecryptfs.c
+@@ -310,6 +310,7 @@ static int process_sig(char *auth_tok_sig)
+ 		goto out;
+ 	}
+ 	mkdir(dot_ecryptfs_dir, S_IRWXU);
++	chown(dot_ecryptfs_dir, getuid(), getgid());
+ 	free(dot_ecryptfs_dir);
+ 	rc = asprintf(&sig_cache_filename, "%s/.ecryptfs/sig-cache.txt",
+ 		      home);