patch-1.3.60 linux/net/ipv4/ipmr.c

• Lines: 51
• Date: Wed Feb 7 08:55:46 1996
• Orig file: v1.3.59/linux/net/ipv4/ipmr.c
• Orig date: Sat Nov 25 19:04:58 1995

diff -u --recursive --new-file v1.3.59/linux/net/ipv4/ipmr.c linux/net/ipv4/ipmr.c
@@ -13,6 +13,7 @@
  *	Fixes:
  *	Michael Chastain	:	Incorrect size of copying.
  *	Alan Cox		:	Added the cache manager code
+ *	Alan Cox		:	Fixed the clone/copy bug and device race.
  *
  *	Status:
  *		Cache manager under test. Forwarding in vague test mode
@@ -704,14 +705,18 @@
 	__u32 raddr=skb->raddr;
 	if(vif->flags&VIFF_TUNNEL)
 	{
-		tunnel=16;
+		tunnel=IPFWD_MULTITUNNEL;
 		raddr=vif->remote;
 	}
 	vif->pkt_out++;
 	vif->bytes_out+=skb->len;
 	skb->dev=vif->dev;
 	skb->raddr=skb->h.iph->daddr;
-	if(ip_forward(skb, in_dev, frag|8|tunnel, raddr)==-1)
+	/*
+	 *	If the vif went down as we were forwarding.. just throw the
+	 *	frame.
+	 */
+	if(vif->dev==NULL || ip_forward(skb, in_dev, frag|IPFWD_MULTICASTING|tunnel, raddr)==-1)
 		kfree_skb(skb, FREE_WRITE);
 }
 
@@ -757,7 +762,11 @@
 		 	{
 		 		if(psend!=-1)
 		 		{
-		 			skb2=skb_clone(skb, GFP_ATOMIC);
+		 			/*
+		 			 *	May get variant mac headers
+		 			 *	so must copy -- boo hoo.
+		 			 */
+		 			skb2=skb_copy(skb, GFP_ATOMIC);
 		 			if(skb2)
 		 			{
 		 				skb2->free=1;
@@ -899,7 +908,7 @@
  
 void ip_mr_init(void)
 {
-	printk("Linux IP multicast router 0.04-might-work 8)\n");
+	printk("Linux IP multicast router 0.05-maybe-works 8)\n");
 	register_netdevice_notifier(&ip_mr_notifier);
 	proc_net_register(&(struct proc_dir_entry) {
 		PROC_NET_IPMR_VIF, 9 ,"ip_mr_vif",