Added patch to fix the buffer overflow that kills slirpvde under fortify.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 62 insertions, 5 deletions

diff --git a/net-misc/vde/ChangeLog b/net-misc/vde/ChangeLog
index f72a3f3afeb1..db14340df26e 100644
--- a/net-misc/vde/ChangeLog
+++ b/net-misc/vde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.19 2009/04/03 17:17:21 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.20 2009/04/06 19:02:06 jmbsvicetto Exp $
+
+  06 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/vde-2.2.2-slirpvde-buffer-overflow.patch, vde-2.2.2.ebuild:
+  Added patch to fix the buffer overflow that kills slirpvde under fortify.
 
   03 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 531986453e69..f42d4d6f3426 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,6 +1,7 @@
 AUX Unixterm_20070403.patch 5054 RMD160 76a8200d0975aa172f39a6937799a5ef2b9bbd40 SHA1 05d891782ea64a639e4c68ade3533a34695d392f SHA256 a17223c1b93c74e9e97636f47da3dd194f499f3b216cf17c50f1f37913b3533a
 AUX vde-2.1.6-gcc43.patch 1010 RMD160 0b3d0872a6ed18fe5bc5e9cebb586194c461b206 SHA1 2983befee2e55ef596c1666ceef3c72290eb672c SHA256 00b6d858a0a5e196555ce5574b9e98ea27b34e737ab1afdfc691b600770465ab
 AUX vde-2.2.2-gcc43.patch 1867 RMD160 e5587fa07b9c8e8caa3f2f03b2dca7f2858478a2 SHA1 cc22e018d5347cae34f430e2f6075b56c0c797d5 SHA256 313a1c3477241adfaf0547577457de669b369a1e83876e1c494d64e0524a4463
+AUX vde-2.2.2-slirpvde-buffer-overflow.patch 1427 RMD160 3baca367b80d0b80f87135f4527915a1951a6162 SHA1 bcc6000255658e89f209222f56d53731f9d58866 SHA256 4e21492c1ca73bba9adcd1e17f6b51b15912631ce18042bf9d2a0b618c0056d0
 AUX vde.conf 187 RMD160 7d3a650dba0d33401095d444cda3230c5fa8f963 SHA1 0ad41e477982d4eba8afa07d183eb6ed55116eab SHA256 00ff15f4850f8afda12dacfe548a29d70a3d504513066e66a6570b88851c858f
 AUX vde.init 748 RMD160 085fb762b9d58b1bb20d8dcd6556b0894bf08a7e SHA1 ebf9963efae6bf012f5ea2b4aa2914928866c338 SHA256 20d3370dc6bdaac5ab5288815223857bb37696c30dbf31d1a613df4e426e2070
 DIST vde-1.5.7.tgz 139314 RMD160 213f87ea465b76c276b660f0b0733820273f5ca7 SHA1 81fc285e56b431a13220e8c8df80b492482b5158 SHA256 a80d907c1705e9b4f5eb62593753f5120e8e71066395fa3241eb425825ccf82b
@@ -13,6 +14,6 @@ EBUILD vde-2.0.2.ebuild 1051 RMD160 2a4c834459c06f1bd5c6722334bfb4a270a3b867 SHA
 EBUILD vde-2.1.1.ebuild 1094 RMD160 8a28f10f084a3fb157976536f5f1a5f0fd993df7 SHA1 aeb6d8647cc1a2c3cffbed0c26d26ab2c7d98da0 SHA256 e761ee77b652cc36aeb1e4c30ece490334a002907c7d537c929399ef06ebb9a5
 EBUILD vde-2.1.6-r1.ebuild 1232 RMD160 aa471f5cbd545b784acfe95e0d9a20e5c02c74ff SHA1 53addcc646619dea1fd878a45ae241f1f7fc0e5c SHA256 ee4396977c6f052e4b3770a3b48f3898b39652d7d1ad20c919c908cca82501ff
 EBUILD vde-2.1.6.ebuild 1099 RMD160 07755732ad3c5cd8c2494d335f20bbef31452419 SHA1 ed9ac22b2e39dbbbf1e91bab245b583ddb46f719 SHA256 dc83def2128b6ae678997429774e7023e4d36e0b078d979f0f56ef2c8cf10e09
-EBUILD vde-2.2.2.ebuild 1160 RMD160 7791f50e18d718fd3f561b34e86d6a1261dbb3a7 SHA1 8d9521e533871b7f701f1ccb10e22e0365b44c8c SHA256 d93c89bdd09add98bc8753c9d4b9fffa0458c8ead39f60bc147b7aa93b45a6e5
-MISC ChangeLog 3428 RMD160 3082273ad09cb108f888916c474267abf4930929 SHA1 444f0b4327ba03b38b7e31c5598b2c68dca9710b SHA256 ac9dec182f3e7eb3aa9776a328bdf5593151b54f5b4d492e2d2b352514d52110
+EBUILD vde-2.2.2.ebuild 1399 RMD160 6fba9ef937f1f6199cee570810fba0ef4d5edf58 SHA1 0c2b8d69d242ee75b9bf04160938ac3c6a2a47c1 SHA256 59f6e1222b4207180b1056cc9ab18ec5f61634b7fd80233f04f4920c592f5090
+MISC ChangeLog 3641 RMD160 e9778926c87303e11a4653aed0467e24e9022546 SHA1 9e00f5b87c84d1a23c3ed10e496c7b885c362297 SHA256 eb2440bc42f807291a0f32a102f130bb68fa6ecf749c63699e65c474c3759273
 MISC metadata.xml 355 RMD160 f51ae5b09e79fb96a26bf909ee257cd2af2d2a20 SHA1 131e6ef28e1b94dc01dfab328231a9156958c7f4 SHA256 0b3f5072e19e0d20adb8c3d5b43cb1ffa3ea7c7bf2f9664ce43e09b37be0fc2b
diff --git a/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch b/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch
new file mode 100644
index 000000000000..cc494e16ac46
--- /dev/null
+++ b/net-misc/vde/files/vde-2.2.2-slirpvde-buffer-overflow.patch
@@ -0,0 +1,49 @@
+From d466d77be6ec40d8d7d96050fbee5e17e7c61af9 Mon Sep 17 00:00:00 2001
+From: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Tue, 30 Sep 2008 16:59:01 +0200
+Subject: [PATCH] fix static buffer overflows
+
+---
+ src/slirpvde/slirpvde.c |   12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/slirpvde/slirpvde.c b/src/slirpvde/slirpvde.c
+index 47512ca..016aa45 100644
+--- a/src/slirpvde/slirpvde.c
++++ b/src/slirpvde/slirpvde.c
+@@ -53,7 +53,7 @@
+ VDECONN *conn;
+ int dhcpmgmt=0;
+ static char *pidfile = NULL;
+-static char pidfile_path[_POSIX_PATH_MAX];
++static char pidfile_path[PATH_MAX];
+ int logok=0;
+ char *prog;
+ extern FILE *lfd;
+@@ -78,9 +78,11 @@ void printlog(int priority, const char *format, ...)
+ static void save_pidfile()
+ {
+ 	if(pidfile[0] != '/')
+-		strncat(pidfile_path, pidfile, PATH_MAX - strlen(pidfile_path));
+-	else
+-		strcpy(pidfile_path, pidfile);
++		strncat(pidfile_path, pidfile, sizeof(pidfile_path) - strlen(pidfile_path) -1);
++	else {
++		pidfile_path[0] = 0;
++		strncat(pidfile_path, pidfile, sizeof(pidfile_path)-1);
++	}
+ 
+ 	int fd = open(pidfile_path,
+ 			O_WRONLY | O_CREAT | O_EXCL,
+@@ -433,7 +435,7 @@ int main(int argc, char **argv)
+ 		exit(1);
+ 	}
+ 	
+-	strcat(pidfile_path, "/");
++	strncat(pidfile_path, "/", sizeof(pidfile_path) - strlen(pidfile_path) -1);
+ 	if (daemonize && daemon(0, 0)) {
+ 		printlog(LOG_ERR,"daemon: %s",strerror(errno));
+ 		exit(1);
+-- 
+1.5.6
+
diff --git a/net-misc/vde/vde-2.2.2.ebuild b/net-misc/vde/vde-2.2.2.ebuild
index 62b66a645fb5..c52ff64ecc89 100644
--- a/net-misc/vde/vde-2.2.2.ebuild
+++ b/net-misc/vde/vde-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.2.2.ebuild,v 1.4 2009/03/06 22:36:38 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.2.2.ebuild,v 1.5 2009/04/06 19:02:06 jmbsvicetto Exp $
 
 inherit base eutils
 
@@ -15,8 +15,11 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 DEPEND=""
+RDEPEND=""
 
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+# The slirpvde-buffer-overflow patch was made by Ludwig Nussel and submitted upstream at
+# http://sourceforge.net/tracker/?func=detail&aid=2138410&group_id=95403&atid=611248
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" "${FILESDIR}/${P}-slirpvde-buffer-overflow.patch" )
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"