linux/net/ipv4/ipmr.c

Bob Tracy - TDS (rct@tracy-tds.wlk.com)
Mon, 7 Apr 1997 09:25:12 -0500 (CDT)

I've seen a few attempts at a patch in the linux-kernel hypermail
archive (haven't seen squat on this mail list in days, and I *know*
you didn't all hop a comet somewhere). The following patch corrects
a typo and a coding error noticed by gcc (end of control reached for
non-void function -- basically, the function as coded can return
either nothing or something, which clearly isn't correct from context).
The return value isn't always checked, but that's another matter.

Apply this patch to either 2.1.31 or 2.1.32: the problem was introduced
in 2.1.31 and not addressed by the 2.1.32 patch set.

-- 
Bob Tracy		| "He who laughs last thinks slowest!
AFIWC/AFCERT		|	-- Anonymous
rct@merkin.csap.af.mil	|


====--CUT HERE--====
--- linux/net/ipv4/ipmr.c.orig	Sun Apr  6 14:21:52 1997
+++ linux/net/ipv4/ipmr.c	Sun Apr  6 22:25:19 1997
@@ -312,8 +312,8 @@
 			printk("mroute: pending queue full, dropping entries.\n");
 		}
 		kfree_skb(skb, FREE_READ);
-		return ret;
 	}
+	return ret;
 }
 
 /*
@@ -357,7 +357,7 @@
 			/* If the report failed throw the cache entry 
 			   out - Brad Parker */
 			if(ipmr_cache_report(skb, vifi, 0)<0)
-				impr_cache_delete(cache);
+				ipmr_cache_delete(cache);
 		}
 	}
 	/*
====--TUC EREH--====