svn commit: r221359 - stable/8/sys/netinet/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Tue May  3 05:09:02 2011
New Revision: 221359
URL: http://svn.freebsd.org/changeset/base/221359

Log:
  MFC r220831:
    ipdn_bound_var() function is designed to bound a variable between
    specified minimum and maximum. In case when specified default value
    is out of bounds it does not work as expected and does not limit
    variable. Check that default value is in range and limit it if needed.
    Also bump max_hash_size value to 65536 to correspond with manual page.
  
    PR:		kern/152887

Modified:
  stable/8/sys/netinet/ipfw/ip_dummynet.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet/ipfw/ip_dummynet.c
==============================================================================
--- stable/8/sys/netinet/ipfw/ip_dummynet.c	Tue May  3 04:44:50 2011	(r221358)
+++ stable/8/sys/netinet/ipfw/ip_dummynet.c	Tue May  3 05:09:02 2011	(r221359)
@@ -108,6 +108,10 @@ ipdn_bound_var(int *v, int dflt, int lo,
 {
 	int oldv = *v;
 	const char *op = NULL;
+	if (dflt < lo)
+		dflt = lo;
+	if (dflt > hi)
+		dflt = hi;
 	if (oldv < lo) {
 		*v = dflt;
 		op = "Bump";
@@ -2129,7 +2133,7 @@ ip_dn_init(void)
 	dn_cfg.red_max_pkt_size = 1500;	/* default max packet size */
 
 	/* hash tables */
-	dn_cfg.max_hash_size = 1024;	/* max in the hash tables */
+	dn_cfg.max_hash_size = 65536;	/* max in the hash tables */
 	dn_cfg.hash_size = 64;		/* default hash size */
 
 	/* create hash tables for schedulers and flowsets.