svn commit: r334202 - stable/10/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Fri May 25 06:26:07 2018
New Revision: 334202
URL: https://svnweb.freebsd.org/changeset/base/334202

Log:
  MFC r333392-r333393, r333427
  
  r333392:
  Fix memory leak. (CID 1199373).
  
  r333393:
  Document intentional fallthrough. (CID 976535)
  
  r333427:
  Fix style error introduced in r333393.
  
  Reported by:	jhb, imp, phk

Modified:
  stable/10/sys/contrib/ipfilter/netinet/fil.c
  stable/10/sys/contrib/ipfilter/netinet/ip_dstlist.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/fil.c	Fri May 25 06:25:33 2018	(r334201)
+++ stable/10/sys/contrib/ipfilter/netinet/fil.c	Fri May 25 06:26:07 2018	(r334202)
@@ -1287,6 +1287,7 @@ ipf_pr_icmp(fin)
 				fin->fin_flx |= FI_BAD;
 		}
 #endif
+		/* FALLTHROUGH */
 	case ICMP_SOURCEQUENCH :
 	case ICMP_REDIRECT :
 	case ICMP_TIMXCEED :

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_dstlist.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_dstlist.c	Fri May 25 06:25:33 2018	(r334201)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_dstlist.c	Fri May 25 06:26:07 2018	(r334202)
@@ -690,6 +690,7 @@ ipf_dstlist_node_del(softc, arg, op, uid)
 	err = COPYIN(op->iplo_struct, temp, size);
 	if (err != 0) {
 		IPFERROR(120027);
+		KFREES(temp, size);
 		return EFAULT;
 	}