rpms/iputils/devel iputils-arping_buf_overflow.patch, NONE, 1.1 iputils.spec, 1.21, 1.22

[fedora-cvs-commits redhat com]

Author: rvokal

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6651

Modified Files:
	iputils.spec 
Added Files:
	iputils-arping_buf_overflow.patch 
Log Message:
 - fixed arping buffer overflow (#163383)

iputils-arping_buf_overflow.patch:
 arping.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE iputils-arping_buf_overflow.patch ---
diff -ur iputils/arping.c iputils.tom/arping.c
--- iputils/arping.c	2005-07-15 13:51:15.533632784 -0700
+++ iputils.tom/arping.c	2005-07-15 13:50:47.967823000 -0700
@@ -59,6 +59,8 @@
 #define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
 			   ((tv1).tv_usec-(tv2).tv_usec)/1000 )
 
+#define min(x,y) ((x)<(y) ? (x) : (y))
+
 void usage(void)
 {
 	fprintf(stderr,
@@ -476,7 +478,7 @@
 	}
 
 	he = me;
-	memset(he.sll_addr, -1, he.sll_halen);
+	memset(he.sll_addr, -1, min(he.sll_halen, sizeof he.sll_addr));
 
 	if (!quiet) {
 		printf("ARPING %s ", inet_ntoa(dst));


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- iputils.spec	27 May 2005 07:20:44 -0000	1.21
+++ iputils.spec	18 Jul 2005 07:15:50 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 23
+Release: 24
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -20,8 +20,9 @@
 Patch9: iputils-20020927-unaligned.patch
 Patch10: iputils-20020927-inet_pton.patch
 Patch11: iputils-retvals.patch
-Patch12: iputils-arping.patch
+#Patch12: iputils-arping.patch
 Patch13: iputils-20020927-ia64_align.patch
+Patch14: iputils-arping_buf_overflow.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: docbook-utils perl-SGMLSpm
@@ -50,8 +51,9 @@
 %patch9 -p1 -b .unaligned
 %patch10 -p1 -b .inet_pton
 %patch11 -p1 -b .retvals
-%patch12 -b .arping
+#%patch12 -b .arping
 %patch13 -p1 -b .align
+%patch14 -p1 -b .buf_overflow
 
 %build
 %ifarch s390 s390x
@@ -148,6 +150,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Mon Jul 18 2005 Radek Vokal <rvokal redhat com> 20020927-24
+- fixed arping buffer overflow (#163383)
+
 * Fri May 27 2005 Radek Vokal <rvokal redhat com> 20020927-23
 - fixed un-initialized "device" (#158914)