svn commit: r291001 - head/sys/netpfil/ipfw

Bryan Drewery bdrewery at FreeBSD.org
Tue Nov 17 20:42:09 UTC 2015


Author: bdrewery
Date: Tue Nov 17 20:42:08 2015
New Revision: 291001
URL: https://svnweb.freebsd.org/changeset/base/291001

Log:
  Fix dynamic IPv6 rules showing junk for non-specified address masks.
  
  For example:
    00002      0         0 (19s) PARENT 1 tcp 10.10.0.5 0 <-> 0.0.0.0 0
    00002      4       412 (1s) LIMIT tcp 10.10.0.5 25848 <-> 10.10.0.7 22
    00002     10       777 (1s) LIMIT tcp 2001:894:5a24:653::503:1 52023 <-> 2001:894:5a24:653:ca0a:a9ff:fe04:3978 22
    00002      0         0 (17s) PARENT 1 tcp 2001:894:5a24:653::503:1 0 <-> 80f3:70d:23fe:ffff:1005:: 0
  
  Fix this by zeroing the unused address, as is done for IPv4:
    00002     0         0 (18s) PARENT 1 tcp 10.10.0.5 0 <-> 0.0.0.0 0
    00002    36     14952 (1s) LIMIT tcp 10.10.0.5 25848 <-> 10.10.0.7 22
    00002     0         0 (0s) PARENT 1 tcp 2001:894:5a24:653::503:1 0 <-> :: 0
    00002     4       345 (274s) LIMIT tcp 2001:894:5a24:653::503:1 34131 <-> 2001:470:1f11:262:ca0a:a9ff:fe04:3978 22
  
  MFC after:	2 weeks

Modified:
  head/sys/netpfil/ipfw/ip_fw_dynamic.c

Modified: head/sys/netpfil/ipfw/ip_fw_dynamic.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_dynamic.c	Tue Nov 17 19:57:49 2015	(r291000)
+++ head/sys/netpfil/ipfw/ip_fw_dynamic.c	Tue Nov 17 20:42:08 2015	(r291001)
@@ -735,6 +735,9 @@ ipfw_install_state(struct ip_fw_chain *c
 		id.fib = M_GETFIB(args->m);
 
 		if (IS_IP6_FLOW_ID (&(args->f_id))) {
+			bzero(&id.src_ip6, sizeof(id.src_ip6));
+			bzero(&id.dst_ip6, sizeof(id.dst_ip6));
+
 			if (limit_mask & DYN_SRC_ADDR)
 				id.src_ip6 = args->f_id.src_ip6;
 			if (limit_mask & DYN_DST_ADDR)


More information about the svn-src-all mailing list