X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/9bccf70c0258c7cac2dcb80011b2a964d884c552..e5568f75972dfc723778653c11cb6b4dc825716a:/bsd/netinet/igmp.c

diff --git a/bsd/netinet/igmp.c b/bsd/netinet/igmp.c
index 3dd855ca8..1430acc47 100644
--- a/bsd/netinet/igmp.c
+++ b/bsd/netinet/igmp.c
@@ -141,31 +141,35 @@ static struct router_info *
 find_rti(ifp)
 	struct ifnet *ifp;
 {
-        register struct router_info *rti = Head;
-
+	register struct router_info *rti = Head;
+	
+	
 #if IGMP_DEBUG
 	printf("[igmp.c, _find_rti] --> entering \n");
 #endif
-        while (rti) {
-                if (rti->rti_ifp == ifp) {
+	while (rti) {
+		if (rti->rti_ifp == ifp) {
 #if IGMP_DEBUG
 			printf("[igmp.c, _find_rti] --> found old entry \n");
 #endif
-                        return rti;
-                }
-                rti = rti->rti_next;
-        }
-
+			return rti;
+		}
+		rti = rti->rti_next;
+	}
+	
 	MALLOC(rti, struct router_info *, sizeof *rti, M_IGMP, M_NOWAIT);
-        rti->rti_ifp = ifp;
-        rti->rti_type = IGMP_V2_ROUTER;
-        rti->rti_time = 0;
-        rti->rti_next = Head;
-        Head = rti;
+	if (rti != NULL)
+	{
+		rti->rti_ifp = ifp;
+		rti->rti_type = IGMP_V2_ROUTER;
+		rti->rti_time = 0;
+		rti->rti_next = Head;
+		Head = rti;
+	}
 #if IGMP_DEBUG
-	printf("[igmp.c, _find_rti] --> created an entry \n");
+	if (rti) printf("[igmp.c, _find_rti] --> created an entry \n");
 #endif
-        return rti;
+	return rti;
 }
 
 void
@@ -224,6 +228,10 @@ igmp_input(m, iphlen)
 	if (timer == 0)
 		timer = 1;
 	rti = find_rti(ifp);
+	if (rti == NULL) {
+		m_freem(m);
+		return;
+	}
 
 	/*
 	 * In the IGMPv2 specification, there are 3 states and a flag.
@@ -361,7 +369,7 @@ igmp_input(m, iphlen)
 	rip_input(m, iphlen);
 }
 
-void
+int
 igmp_joingroup(inm)
 	struct in_multi *inm;
 {
@@ -373,12 +381,14 @@ igmp_joingroup(inm)
 		inm->inm_state = IGMP_OTHERMEMBER;
 	} else {
 		inm->inm_rti = find_rti(inm->inm_ifp);
+		if (inm->inm_rti == NULL) return ENOMEM;
 		igmp_sendpkt(inm, inm->inm_rti->rti_type, 0);
 		inm->inm_timer = IGMP_RANDOM_DELAY(
 					IGMP_MAX_HOST_REPORT_DELAY*PR_FASTHZ);
 		inm->inm_state = IGMP_IREPORTEDLAST;
 		igmp_timers_are_running = 1;
 	}
+	return 0;
 	splx(s);
 }