patch-1.3.22 linux/net/ipv4/arp.c

• Lines: 28
• Date: Fri Sep 1 14:31:56 1995
• Orig file: v1.3.21/linux/net/ipv4/arp.c
• Orig date: Mon Aug 28 14:52:25 1995

diff -u --recursive --new-file v1.3.21/linux/net/ipv4/arp.c linux/net/ipv4/arp.c
@@ -42,6 +42,7 @@
  *		Mike Shaver     :       RFC1122 checks.
  *		Jonathan Naylor :	Only lookup the hardware address for
  *					the correct hardware type.
+ *		Germano Caronni	:	Assorted subtle races
  */
 
 /* RFC1122 Status:
@@ -278,6 +279,7 @@
 		skb_device_lock(skb);
 		restore_flags(flags);
 		dev_kfree_skb(skb, FREE_WRITE);
+		cli();
 	}
 	restore_flags(flags);
 	del_timer(&entry->timer);
@@ -556,8 +558,10 @@
 	{
 		if (entry->ip == ip_addr)
 		{
-			if ((entry->flags & ATF_PERM) && !force)
+			if ((entry->flags & ATF_PERM) && !force) {
+				sti();
 				return;
+			}
 			*pentry = entry->next;
 			del_timer(&entry->timer);
 			sti();