rpms/dhcp/F-12 dhcp-4.1.1-P1-parse_date.patch, NONE, 1.1 dhcp.spec, 1.300, 1.301

Jiří Popelka jpopelka at fedoraproject.org
Tue Jun 29 10:25:17 UTC 2010 

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24458

Modified Files:
	dhcp.spec 
Added Files:
	dhcp-4.1.1-P1-parse_date.patch 
Log Message:
* Tue Jun 29 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.1-18.P1
- Fix parsing of date (#514828)


dhcp-4.1.1-P1-parse_date.patch:
 parse.c |   80 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 45 insertions(+), 35 deletions(-)

--- NEW FILE dhcp-4.1.1-P1-parse_date.patch ---
diff -up dhcp-4.1.1-P1/common/parse.c.parse_date dhcp-4.1.1-P1/common/parse.c
--- dhcp-4.1.1-P1/common/parse.c.parse_date	2010-06-11 14:25:10.000000000 +0200
+++ dhcp-4.1.1-P1/common/parse.c	2010-06-11 15:00:08.000000000 +0200
@@ -913,48 +913,46 @@ parse_date_core(cfile)
 					  212, 243, 273, 304, 334 };
 
 	/* Day of week, or "never"... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token == NEVER) {
-		if (!parse_semi (cfile))
-			return 0;
+		next_token (&val, (unsigned *)0, cfile); /* consume NEVER*/
 		return MAX_TIME;
 	}
 
 	/* This indicates 'local' time format. */
 	if (token == EPOCH) {
-		token = next_token(&val, NULL, cfile);
-
+		next_token(&val, (unsigned *)0, cfile); /* consume EPOCH */
+		token = peek_token (&val, (unsigned *)0, cfile);
 		if (token != NUMBER) {
 			parse_warn(cfile, "Seconds since epoch expected.");
 			if (token != SEMI)
-				skip_to_semi(cfile);
+				next_token(&val, (unsigned *)0, cfile);
 			return (TIME)0;
 		}
+		next_token(&val, (unsigned *)0, cfile); /* consume seconds */
 
 		guess = atoi(val);
-
-		if (!parse_semi(cfile))
-			return (TIME)0;
-
 		return guess;
 	}
 
 	if (token != NUMBER) {
 		parse_warn (cfile, "numeric day of week expected.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume day of week */
 	wday = atoi (val);
 
 	/* Year... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != NUMBER) {
 		parse_warn (cfile, "numeric year expected.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume Year*/
 
 	/* Note: the following is not a Y2K bug - it's a Y1.9K bug.   Until
 	   somebody invents a time machine, I think we can safely disregard
@@ -965,101 +963,113 @@ parse_date_core(cfile)
 		year -= 1900;
 
 	/* Slash separating year from month... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != SLASH) {
 		parse_warn (cfile,
 			    "expected slash separating year from month.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	token = next_token(&val, (unsigned *)0, cfile); /* consume SLASH */
 
 	/* Month... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != NUMBER) {
 		parse_warn (cfile, "numeric month expected.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume Month */
 	mon = atoi (val) - 1;
 
 	/* Slash separating month from day... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != SLASH) {
 		parse_warn (cfile,
 			    "expected slash separating month from day.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume SLASH */
 
 	/* Day of month... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != NUMBER) {
 		parse_warn (cfile, "numeric day of month expected.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume Day of month */
 	mday = atoi (val);
 
 	/* Hour... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != NUMBER) {
 		parse_warn (cfile, "numeric hour expected.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume Hour */
 	hour = atoi (val);
 
 	/* Colon separating hour from minute... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != COLON) {
 		parse_warn (cfile,
 			    "expected colon separating hour from minute.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume Colon */
 
 	/* Minute... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != NUMBER) {
 		parse_warn (cfile, "numeric minute expected.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume Minute */
 	min = atoi (val);
 
 	/* Colon separating minute from second... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != COLON) {
 		parse_warn (cfile,
 			    "expected colon separating minute from second.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume Colon */
 
 	/* Second... */
-	token = next_token (&val, (unsigned *)0, cfile);
+	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token != NUMBER) {
 		parse_warn (cfile, "numeric second expected.");
 		if (token != SEMI)
-			skip_to_semi (cfile);
+			next_token(&val, (unsigned *)0, cfile);
 		return (TIME)0;
 	}
+	next_token(&val, (unsigned *)0, cfile); /* consume Second */
 	sec = atoi (val);
 
+	tzoff = 0;
 	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token == NUMBER) {
-		token = next_token (&val, (unsigned *)0, cfile);
+		next_token (&val, (unsigned *)0, cfile); /* consume tzoff */
 		tzoff = atoi (val);
-	} else
-		tzoff = 0;
+	} else if (token != SEMI) {
+		parse_warn (cfile, "Time zone offset or semicolon expected.");
+		next_token (&val, (unsigned *)0, cfile);
+	}
 
 	/* Guess the time value... */
 	guess = ((((((365 * (year - 70) +	/* Days in years since '70 */
@@ -1095,7 +1105,7 @@ parse_date(cfile)
 
        /* Make sure the date ends in a semicolon... */
        if (!parse_semi(cfile))
-               return 0;
+               return (TIME)0;
        return guess;
 }
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-12/dhcp.spec,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -p -r1.300 -r1.301
--- dhcp.spec	3 Jun 2010 10:22:01 -0000	1.300
+++ dhcp.spec	29 Jun 2010 10:25:17 -0000	1.301
@@ -15,7 +15,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.1
-Release:  17.%{patchver}%{?dist}
+Release:  18.%{patchver}%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -60,6 +60,7 @@ Patch22:  %{name}-4.1.1-UseMulticast.pat
 Patch23:  %{name}-4.1.1-sendDecline.patch
 Patch24:  %{name}-4.1.1-retransmission.patch
 Patch25:  %{name}-4.1.1-release6-elapsed.patch
+Patch26:  %{name}-4.1.1-P1-parse_date.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -231,6 +232,10 @@ libdhcpctl and libomapi static libraries
 # (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #21171])
 %patch25 -p1 -b .release6-elapsed
 
+# Fix parsing of date (#514828)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #21501])
+%patch26 -p1 -b .parse_date
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -513,8 +518,12 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Jun 29 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.1-18.P1
+- Fix parsing of date (#514828)
+
 * Wed Jun 03 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.1-17.P1
 - 4.1.1-P1 (pair of bug fixes including one for a security related bug).
+- Fix for CVE-2010-2156 (#601405)
 - Compile with -fno-strict-aliasing
 - N-V-R (copied from bind.spec): Name-Version-Release.Patch.dist

More information about the scm-commits mailing list