[gentoo-commits] gentoo-x86 commit in net-analyzer/netperf/files: netperf-fix-scripts.patch netperf-CVE-2007-1444.patch netperf-2.2alpha.diff

[Peter Volkov (pva)]

pva         08/01/31 13:28:29

  Modified:             netperf-fix-scripts.patch
  Added:                netperf-CVE-2007-1444.patch
  Removed:              netperf-2.2alpha.diff
  Log:
  Version bump. Fixed security issue (CVE-2007-1444), bug 170569, reported by Pierre-Yves Rofes <py AT gentoo.org>. Patch for vulnerability taken from bugs.debian.org/413658, thank you Nico Golde <nion AT debian.org> for the fix! Remove old.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.2                  net-analyzer/netperf/files/netperf-fix-scripts.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/netperf/files/netperf-fix-scripts.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/netperf/files/netperf-fix-scripts.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/netperf/files/netperf-fix-scripts.patch?r1=1.1&r2=1.2

Index: netperf-fix-scripts.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/netperf/files/netperf-fix-scripts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netperf-fix-scripts.patch	29 Jan 2007 20:05:05 -0000	1.1
+++ netperf-fix-scripts.patch	31 Jan 2008 13:28:29 -0000	1.2
@@ -1,44 +1,31 @@
-diff -u doc/examples.ori/arr_script doc/examples/arr_script
---- doc/examples.ori/arr_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/arr_script	2007-01-29 20:01:16.000000000 +0000
-@@ -10,8 +10,8 @@
+diff -Naur netperf-2.4.4.orig/doc/examples/arr_script netperf-2.4.4/doc/examples/arr_script
+--- netperf-2.4.4.orig/doc/examples/arr_script	2007-06-02 02:06:03.000000000 +0400
++++ netperf-2.4.4/doc/examples/arr_script	2008-01-31 15:34:54.000000000 +0300
+@@ -12,8 +12,7 @@
    TOLERANCE=15
    MAX_RETRIES=3
  
 -  NETPERF="/usr/local/netperf/netperf"
 -  NETPERF="./netperf"
-+#  NETPERF="/usr/local/netperf/netperf"
 +  NETPERF="/usr/bin/netperf"
  
    NPROC_LIST=""
    RR_SIZES=""
-diff -u doc/examples.ori/packet_byte_script doc/examples/packet_byte_script
---- doc/examples.ori/packet_byte_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/packet_byte_script	2007-01-29 20:01:16.000000000 +0000
-@@ -22,7 +22,7 @@
+diff -Naur netperf-2.4.4.orig/doc/examples/packet_byte_script netperf-2.4.4/doc/examples/packet_byte_script
+--- netperf-2.4.4.orig/doc/examples/packet_byte_script	2008-01-31 15:23:26.000000000 +0300
++++ netperf-2.4.4/doc/examples/packet_byte_script	2008-01-31 15:35:21.000000000 +0300
+@@ -25,7 +25,7 @@
  fi
  
  # where is netperf
--NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf}
-+NETPERF_CMD=${NETPERF_CMD:=/usr/bin/netperf}
+-NETPERF_DIR=${NETPERF_DIR:=/opt/netperf2/bin}
++NETPERF_DIR=${NETPERF_DIR:=/usr/bin}
  
- # at what port will netserver be waiting? If you decide to run
- # netserver at a differnet port than the default of 12865, then set
-diff -u doc/examples.ori/sctp_stream_script doc/examples/sctp_stream_script
---- doc/examples.ori/sctp_stream_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/sctp_stream_script	2007-01-29 20:01:16.000000000 +0000
-@@ -24,7 +24,7 @@
- # where the programs are
- #NETHOME=/usr/local/netperf
- #NETHOME="/opt/netperf"
--NETHOME=.
-+NETHOME=/usr/bin/
  
  # at what port will netserver be waiting? If you decide to run
- # netserver at a differnet port than the default of 12865, then set
-diff -u doc/examples.ori/snapshot_script doc/examples/snapshot_script
---- doc/examples.ori/snapshot_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/snapshot_script	2007-01-29 20:01:16.000000000 +0000
+diff -Naur netperf-2.4.4.orig/doc/examples/snapshot_script netperf-2.4.4/doc/examples/snapshot_script
+--- netperf-2.4.4.orig/doc/examples/snapshot_script	2007-06-02 02:06:03.000000000 +0400
++++ netperf-2.4.4/doc/examples/snapshot_script	2008-01-31 15:35:38.000000000 +0300
 @@ -37,7 +37,7 @@
  #
  # where is netperf installed, there are a few possible places:
@@ -48,64 +35,3 @@
  
  
  # there should be no more than two parms passed
-Only in doc/examples: .svn
-diff -u doc/examples.ori/tcp_range_script doc/examples/tcp_range_script
---- doc/examples.ori/tcp_range_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/tcp_range_script	2007-01-29 20:01:16.000000000 +0000
-@@ -43,7 +43,7 @@
- # where is netperf, and are there any "constant" options such as 
- # the netserver port number
- #NETHOME=/usr/etc/net_perf
--NETHOME="."
-+NETHOME="/usr/bin"
- NETPERF=$NETHOME/netperf $PORT
- 
- # How accurate we want the estimate of performance: 
-diff -u doc/examples.ori/tcp_rr_script doc/examples/tcp_rr_script
---- doc/examples.ori/tcp_rr_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/tcp_rr_script	2007-01-29 20:01:16.000000000 +0000
-@@ -25,7 +25,7 @@
- # where the programs are
- #NETHOME=/usr/local/netperf
- #NETHOME="/opt/netperf"
--NETHOME=.
-+NETHOME="/usr/bin"
- 
- # at what port will netserver be waiting? If you decide to run
- # netserver at a differnet port than the default of 12865, then set
-diff -u doc/examples.ori/tcp_stream_script doc/examples/tcp_stream_script
---- doc/examples.ori/tcp_stream_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/tcp_stream_script	2007-01-29 20:01:16.000000000 +0000
-@@ -24,7 +24,7 @@
- # where the programs are
- #NETHOME=/usr/local/netperf
- #NETHOME="/opt/netperf"
--NETHOME=.
-+NETHOME="/usr/bin"
- 
- # at what port will netserver be waiting? If you decide to run
- # netserver at a different port than the default of 12865, then set
-diff -u doc/examples.ori/udp_rr_script doc/examples/udp_rr_script
---- doc/examples.ori/udp_rr_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/udp_rr_script	2007-01-29 20:01:16.000000000 +0000
-@@ -22,7 +22,7 @@
- 
- #NETHOME=/usr/local/netperf
- #NETHOME="/opt/netperf"
--NETHOME="."
-+NETHOME="/usr/bin"
- 
- # at what port will netserver be waiting? If you decide to run
- # netserver at a differnet port than the default of 12865, then set
-diff -u doc/examples.ori/udp_stream_script doc/examples/udp_stream_script
---- doc/examples.ori/udp_stream_script	2007-01-29 20:01:45.000000000 +0000
-+++ doc/examples/udp_stream_script	2007-01-29 20:01:16.000000000 +0000
-@@ -19,7 +19,7 @@
- 
- #NETHOME=/usr/local/netperf
- #NETHOME="/opt/netperf"
--NETHOME="."
-+NETHOME="/usr/bin"
- 
- # at what port will netserver be waiting? If you decide to run
- # netserver at a differnet port than the default of 12865, then set



1.1                  net-analyzer/netperf/files/netperf-CVE-2007-1444.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch?rev=1.1&content-type=text/plain

Index: netperf-CVE-2007-1444.patch
===================================================================
diff -Naur netperf-2.4.4.orig/src/netlib.c netperf-2.4.4.patched/src/netlib.c
--- netperf-2.4.4.orig/src/netlib.c	2007-10-18 01:16:02.000000000 +0400
+++ netperf-2.4.4.patched/src/netlib.c	2008-01-30 22:03:01.000000000 +0300
@@ -244,6 +244,7 @@
 union   netperf_response_struct netperf_response;
 
 FILE    *where;
+int	fd = -1;
 
 char    libfmt = '?';
         
diff -Naur netperf-2.4.4.orig/src/netlib.h netperf-2.4.4.patched/src/netlib.h
--- netperf-2.4.4.orig/src/netlib.h	2007-10-18 01:17:37.000000000 +0400
+++ netperf-2.4.4.patched/src/netlib.h	2008-01-30 21:46:34.000000000 +0300
@@ -445,6 +445,7 @@
 extern  SOCKET  server_sock;
 extern  int     times_up;
 extern  FILE    *where;
+extern int      fd;
 extern  int     loops_per_msec;
 extern  float   lib_local_per_cpu_util[];
   
diff -Naur netperf-2.4.4.orig/src/netserver.c netperf-2.4.4.patched/src/netserver.c
--- netperf-2.4.4.orig/src/netserver.c	2007-10-18 01:09:12.000000000 +0400
+++ netperf-2.4.4.patched/src/netserver.c	2008-01-30 21:57:56.000000000 +0300
@@ -153,6 +153,9 @@
 char    listen_port[10];
 extern	char	*optarg;
 extern	int	optind, opterr;
+#if !defined(WIN_32)
+char debuglog[] = "/tmp/netperf.debugXXXXXX";
+#endif
 
 #ifndef WIN32
 #define SERVER_ARGS "dL:n:p:v:V46"
@@ -225,6 +228,10 @@
       if (!debug) 
       {
 	fclose(where);
+#if !defined(WIN32)
+	unlink(debuglog);
+	close(fd);
+#endif
 #if !defined(WIN32) && !defined(MPE) && !defined(__VMS)
 	/* For Unix: reopen the debug write file descriptor to "/dev/null" */
 	/* and redirect stdout to it.					   */
@@ -918,8 +925,11 @@
   strcpy(FileName, DEBUG_LOG_FILE);
     
 #ifndef WIN32
-  snprintf(&FileName[strlen(FileName)], sizeof(FileName) - strlen(FileName), "_%d", getpid());
-  if ((where = fopen(FileName, "w")) == NULL) {
+  if((fd = mkstemp(debuglog)) == -1 || (where = fdopen(fd, "w+")) == NULL){
+    if(fd != -1){
+      unlink(debuglog);
+      close(fd);
+    }
     perror("netserver: debug file");
     exit(1);
   }
@@ -947,10 +957,6 @@
     }
   }
 #endif
- 
-#ifndef WIN32 
-  chmod(DEBUG_LOG_FILE,0644);
-#endif
   
 #if WIN32
   if (child) {



-- 
gentoo-commits@l.g.o mailing list