Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Jul 2012 18:14:05 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r238494 - stable/8/sys/netinet6
Message-ID:  <201207151814.q6FIE5Cq063039@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bz
Date: Sun Jul 15 18:14:04 2012
New Revision: 238494
URL: http://svn.freebsd.org/changeset/base/238494

Log:
  MFC r238222:
  
   As mentioned in the commit message of r237571 (copied from a prototype
   patch of mine) also check if the 2nd in6_setscope() failed and return
   the error in that case.

Modified:
  stable/8/sys/netinet6/in6.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/netinet6/in6.c
==============================================================================
--- stable/8/sys/netinet6/in6.c	Sun Jul 15 18:12:09 2012	(r238493)
+++ stable/8/sys/netinet6/in6.c	Sun Jul 15 18:14:04 2012	(r238494)
@@ -1235,7 +1235,9 @@ in6_purgeaddr_mc(struct ifnet *ifp, stru
 		sin6.sin6_family = AF_INET6;
 		memcpy(&sin6.sin6_addr, &satosin6(ifa0->ifa_addr)->sin6_addr, 
 		    sizeof(sin6.sin6_addr));
-		in6_setscope(&sin6.sin6_addr, ifa0->ifa_ifp, NULL);
+		error = in6_setscope(&sin6.sin6_addr, ifa0->ifa_ifp, NULL);
+		if (error != 0)
+			return (error);
 	}
 
 	rt = in6_rtalloc1((struct sockaddr *)&mltaddr, 0, 0UL, RT_DEFAULT_FIB);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207151814.q6FIE5Cq063039>