patch-2.2.4 linux/net/ipv4/igmp.c

• Lines: 46
• Date: Sun Mar 21 07:22:00 1999
• Orig file: v2.2.3/linux/net/ipv4/igmp.c
• Orig date: Thu Jan 7 15:11:41 1999

diff -u --recursive --new-file v2.2.3/linux/net/ipv4/igmp.c linux/net/ipv4/igmp.c
@@ -8,7 +8,7 @@
  *	the older version didn't come out right using gcc 2.5.8, the newer one
  *	seems to fall out with gcc 2.6.2.
  *
- *	Version: $Id: igmp.c,v 1.28 1998/11/30 15:53:13 davem Exp $
+ *	Version: $Id: igmp.c,v 1.29 1999/03/21 05:22:36 davem Exp $
  *
  *	Authors:
  *		Alan Cox <Alan.Cox@linux.org>
@@ -97,6 +97,7 @@
 #include <linux/mroute.h>
 #endif
 
+#define IP_MAX_MEMBERSHIPS 20
 
 #ifdef CONFIG_IP_MULTICAST
 
@@ -462,7 +463,9 @@
 	for (ip=&in_dev->mc_list; (i=*ip)!=NULL; ip=&i->next) {
 		if (i->multiaddr==addr) {
 			if (--i->users == 0) {
+				net_serialize_enter();
 				*ip = i->next;
+				net_serialize_leave();
 				igmp_group_dropped(i);
 				if (in_dev->dev->flags & IFF_UP)
 					ip_rt_multicast_event(in_dev);
@@ -610,7 +613,9 @@
 			struct in_device *in_dev;
 			if (--iml->count)
 				return 0;
+			net_serialize_enter();
 			*imlp = iml->next;
+			net_serialize_leave();
 			in_dev = inetdev_by_index(iml->multi.imr_ifindex);
 			if (in_dev)
 				ip_mc_dec_group(in_dev, imr->imr_multiaddr.s_addr);
@@ -684,6 +689,8 @@
 	len-=(offset-begin);
 	if(len>length)
 		len=length;
+	if(len<0)
+		len=0;
 	return len;
 }
 #endif