From max@love2party.net  Tue Mar 11 10:35:38 2008
Return-Path: <max@love2party.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6BF921065671
	for <bug-followup@freebsd.org>; Tue, 11 Mar 2008 10:35:38 +0000 (UTC)
	(envelope-from max@love2party.net)
Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.179])
	by mx1.freebsd.org (Postfix) with ESMTP id DC8E58FC15
	for <bug-followup@freebsd.org>; Tue, 11 Mar 2008 10:35:37 +0000 (UTC)
	(envelope-from max@love2party.net)
Received: from vampire.homelinux.org (dslb-088-066-062-136.pools.arcor-ip.net [88.66.62.136])
	by mrelayeu.kundenserver.de (node=mrelayeu5) with ESMTP (Nemesis)
	id 0ML25U-1JZ1dO1tQX-0003eG; Tue, 11 Mar 2008 11:23:02 +0100
Received: (qmail 35382 invoked by uid 80); 11 Mar 2008 10:22:26 -0000
Received: from 192.168.4.151
        (SquirrelMail authenticated user mlaier)
        by router.laiers.local with HTTP;
        Tue, 11 Mar 2008 11:22:26 +0100 (CET)
Message-Id: <35152.192.168.4.151.1205230946.squirrel@router.laiers.local>
Date: Tue, 11 Mar 2008 11:22:26 +0100 (CET)
From: "Max Laier" <max@love2party.net>
To: bug-followup@freebsd.org
Cc: rand@meridian-enviro.com, "Wouter de Jong" <maddog2k@maddog2k.net>
Subject:

>Number:         121592
>Category:       kern
>Synopsis:       Re: kern/121574: [carp] CARP hash dependent on order of IP addresses on interface
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 11 10:40:02 UTC 2008
>Closed-Date:    Tue Mar 11 15:09:52 UTC 2008
>Last-Modified:  Tue Mar 11 15:09:52 UTC 2008
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 ------=_20080311112226_77382
 Content-Type: text/plain; charset="iso-8859-1"
 Content-Transfer-Encoding: 8bit
 
 Please try the attached patch (mostly OpenBSD rev. 1.114 plus follow-ups).
  This should fix the symptom.  I have no idea why your address lists would
 get skewed however.  They "should"[tm] be in the order in which you add
 aliases.
 
 -- Max
 ------=_20080311112226_77382
 Content-Type: text/x-diff; name="ip_carp.c.RELENG_6.diff"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="ip_carp.c.RELENG_6.diff"
 
 Index: ip_carp.c
 ===================================================================
 RCS file: /home/mlaier/fcvs/src/sys/netinet/ip_carp.c,v
 retrieving revision 1.27.2.12
 diff -u -r1.27.2.12 ip_carp.c
 --- ip_carp.c	1 Feb 2008 11:20:41 -0000	1.27.2.12
 +++ ip_carp.c	11 Mar 2008 10:20:42 -0000
 @@ -238,9 +238,12 @@
  	u_int8_t version = CARP_VERSION, type = CARP_ADVERTISEMENT;
  	u_int8_t vhid = sc->sc_vhid & 0xff;
  	struct ifaddr *ifa;
 -	int i;
 +	int i, found;
 +#ifdef INET
 +	struct in_addr last, cur, in;
 +#endif
  #ifdef INET6
 -	struct in6_addr in6;
 +	struct in6_addr last6, cur6, in6;
  #endif
  
  	if (sc->sc_carpdev)
 @@ -261,21 +264,45 @@
  	SHA1Update(&sc->sc_sha1, (void *)&type, sizeof(type));
  	SHA1Update(&sc->sc_sha1, (void *)&vhid, sizeof(vhid));
  #ifdef INET
 -	TAILQ_FOREACH(ifa, &SC2IFP(sc)->if_addrlist, ifa_list) {
 -		if (ifa->ifa_addr->sa_family == AF_INET)
 -			SHA1Update(&sc->sc_sha1,
 -			    (void *)&ifatoia(ifa)->ia_addr.sin_addr.s_addr,
 -			    sizeof(struct in_addr));
 -	}
 +	cur.s_addr = 0;
 +	do {
 +		found = 0;
 +		last = cur;
 +		cur.s_addr = 0xffffffff;
 +		TAILQ_FOREACH(ifa, &SC2IFP(sc)->if_addrlist, ifa_list) {
 +			in.s_addr = ifatoia(ifa)->ia_addr.sin_addr.s_addr;
 +			if (ifa->ifa_addr->sa_family == AF_INET &&
 +			    ntohl(in.s_addr) > ntohl(last.s_addr) &&
 +			    ntohl(in.s_addr) < ntohl(cur.s_addr)) {
 +				cur.s_addr = in.s_addr;
 +				found++;
 +			}
 +		}
 +		if (found)
 +			SHA1Update(&sc->sc_sha1, (void *)&cur, sizeof(cur));
 +	} while (found);
  #endif /* INET */
  #ifdef INET6
 -	TAILQ_FOREACH(ifa, &SC2IFP(sc)->if_addrlist, ifa_list) {
 -		if (ifa->ifa_addr->sa_family == AF_INET6) {
 +	memset(&cur6, 0, sizeof(cur6));
 +	do {
 +		found = 0;
 +		last6 = cur6;
 +		memset(&cur6, 0xff, sizeof(cur6));
 +		TAILQ_FOREACH(ifa, &SC2IFP(sc)->if_addrlist, ifa_list) {
  			in6 = ifatoia6(ifa)->ia_addr.sin6_addr;
 -			in6_clearscope(&in6);
 -			SHA1Update(&sc->sc_sha1, (void *)&in6, sizeof(in6));
 +			if (IN6_IS_SCOPE_LINKLOCAL(&in6) ||
 +			    IN6_IS_ADDR_MC_INTFACELOCAL(&in6))
 +				in6.s6_addr16[1] = 0;
 +			if (ifa->ifa_addr->sa_family == AF_INET6 &&
 +			    memcmp(&in6, &last6, sizeof(in6)) > 0 &&
 +			    memcmp(&in6, &cur6, sizeof(in6)) < 0) {
 +				cur6 = in6;
 +				found++;
 +			}
  		}
 -	}
 +		if (found)
 +			SHA1Update(&sc->sc_sha1, (void *)&cur6, sizeof(cur6));
 +	} while (found);
  #endif /* INET6 */
  
  	/* convert ipad to opad */
 ------=_20080311112226_77382
 Content-Type: text/x-diff; name="ip_carp.c.HEAD.diff"
 Content-Transfer-Encoding: 8bit
 Content-Disposition: attachment; filename="ip_carp.c.HEAD.diff"
 
 Index: ip_carp.c
 ===================================================================
 RCS file: /home/mlaier/fcvs/src/sys/netinet/ip_carp.c,v
 retrieving revision 1.27.2.12
 diff -u -r1.27.2.12 ip_carp.c
 --- ip_carp.c	1 Feb 2008 11:20:41 -0000	1.27.2.12
 +++ ip_carp.c	11 Mar 2008 10:16:12 -0000
 @@ -238,9 +238,12 @@
  	u_int8_t version = CARP_VERSION, type = CARP_ADVERTISEMENT;
  	u_int8_t vhid = sc->sc_vhid & 0xff;
  	struct ifaddr *ifa;
 -	int i;
 +	int i, found;
 +#ifdef INET
 +	struct in_addr last, cur, in;
 +#endif
  #ifdef INET6
 -	struct in6_addr in6;
 +	struct in6_addr last6, cur6, in6;
  #endif
  
  	if (sc->sc_carpdev)
 @@ -261,21 +264,44 @@
  	SHA1Update(&sc->sc_sha1, (void *)&type, sizeof(type));
  	SHA1Update(&sc->sc_sha1, (void *)&vhid, sizeof(vhid));
  #ifdef INET
 -	TAILQ_FOREACH(ifa, &SC2IFP(sc)->if_addrlist, ifa_list) {
 -		if (ifa->ifa_addr->sa_family == AF_INET)
 -			SHA1Update(&sc->sc_sha1,
 -			    (void *)&ifatoia(ifa)->ia_addr.sin_addr.s_addr,
 -			    sizeof(struct in_addr));
 -	}
 +	cur.s_addr = 0;
 +	do {
 +		found = 0;
 +		last = cur;
 +		cur.s_addr = 0xffffffff;
 +		TAILQ_FOREACH(ifa, &SC2IFP(sc)->if_addrlist, ifa_list) {
 +			in.s_addr = ifatoia(ifa)->ia_addr.sin_addr.s_addr;
 +			if (ifa->ifa_addr->sa_family == AF_INET &&
 +			    ntohl(in.s_addr) > ntohl(last.s_addr) &&
 +			    ntohl(in.s_addr) < ntohl(cur.s_addr)) {
 +				cur.s_addr = in.s_addr;
 +				found++;
 +			}
 +		}
 +		if (found)
 +			SHA1Update(&sc->sc_sha1, (void *)&cur, sizeof(cur));
 +	} while (found);
  #endif /* INET */
  #ifdef INET6
 -	TAILQ_FOREACH(ifa, &SC2IFP(sc)->if_addrlist, ifa_list) {
 -		if (ifa->ifa_addr->sa_family == AF_INET6) {
 +	memset(&cur6, 0, sizeof(cur6));
 +	do {
 +		found = 0;
 +		last6 = cur6;
 +		memset(&cur6, 0xff, sizeof(cur6));
 +		TAILQ_FOREACH(ifa, &SC2IFP(sc)->if_addrlist, ifa_list) {
  			in6 = ifatoia6(ifa)->ia_addr.sin6_addr;
 -			in6_clearscope(&in6);
 -			SHA1Update(&sc->sc_sha1, (void *)&in6, sizeof(in6));
 +			if (IN6_IS_SCOPE_EMBED(&in6))
 +				in6.s6_addr16[1] = 0;
 +			if (ifa->ifa_addr->sa_family == AF_INET6 &&
 +			    memcmp(&in6, &last6, sizeof(in6)) > 0 &&
 +			    memcmp(&in6, &cur6, sizeof(in6)) < 0) {
 +				cur6 = in6;
 +				found++;
 +			}
  		}
 -	}
 +		if (found)
 +			SHA1Update(&sc->sc_sha1, (void *)&cur6, sizeof(cur6));
 +	} while (found);
  #endif /* INET6 */
  
  	/* convert ipad to opad */
 ------=_20080311112226_77382--
 
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Tue Mar 11 15:07:35 UTC 2008 
State-Changed-Why:  
Misfiled followup to kern/121574. 


Responsible-Changed-From-To: gnats-admin->freebsd-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Mar 11 15:07:35 UTC 2008 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=121592 
>Unformatted:
