kernel/3774: advskew uninitialized in ip_carp.c

[Frank Denis <j@pureftpd.org>]

>Number:         3774
>Category:       kernel
>Synopsis:       advskew uninitialized in ip_carp.c
>Confidential:   yes
>Severity:       non-critical
>Priority:       low
>Responsible:    bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat May 08 18:20:01 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jedi/Sector One
>Release:        -current
>Organization:
net
>Environment:
	System      : OpenBSD 3.5
	Architecture: OpenBSD.i386
	Machine     : i386
>Description:
It looks like advskew is uninitialized when a value > 240 is configured.
>How-To-Repeat:
-
>Fix:
Index: ip_carp.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_carp.c,v
retrieving revision 1.46
diff -u -r1.46 ip_carp.c
--- ip_carp.c	2004/05/08 02:53:03	1.46
+++ ip_carp.c	2004/05/08 17:59:51
@@ -731,12 +731,10 @@
 		advskew = 255;
 	} else {
 		advbase = sc->sc_advbase;
-		if (!carp_suppress_preempt)
+		if (!carp_suppress_preempt || sc->sc_advskew > 240)
 			advskew = sc->sc_advskew;
-		else {
-			if (sc->sc_advskew < 240)
-				advskew = 240;
-		}
+		else
+			advskew = 240;
 		tv.tv_sec = advbase;
 		tv.tv_usec = advskew * 1000000 / 256;
 	}


>Release-Note:
>Audit-Trail:
>Unformatted: