Author: bz
Date: Sun Jul 15 11:13:09 2012
New Revision: 238476
URL: http://svn.freebsd.org/changeset/base/238476

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.
  
  Approved by:  re (kib)

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

Modified: stable/9/sys/netinet6/in6.c
==============================================================================
--- stable/9/sys/netinet6/in6.c Sun Jul 15 11:04:49 2012        (r238475)
+++ stable/9/sys/netinet6/in6.c Sun Jul 15 11:13:09 2012        (r238476)
@@ -1341,7 +1341,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);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to