svn commit: r295402 - stable/10/sys/netpfil/pf

[Gleb Smirnoff]

Author: glebius
Date: Mon Feb  8 17:47:58 2016
New Revision: 295402
URL: https://svnweb.freebsd.org/changeset/base/295402

Log:
  Merge r264915: fix NULL pointer derefernce with special sequence of
  DIOCADDADDR and DIOCADDRULE.
  
  PR:		206933
  Approved by:	re (marius)

Modified:
  stable/10/sys/netpfil/pf/pf_ioctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf_ioctl.c	Mon Feb  8 17:47:36 2016	(r295401)
+++ stable/10/sys/netpfil/pf/pf_ioctl.c	Mon Feb  8 17:47:58 2016	(r295402)
@@ -350,7 +350,9 @@ pf_empty_pool(struct pf_palist *poola)
 			pfi_dynaddr_remove(pa->addr.p.dyn);
 			break;
 		case PF_ADDR_TABLE:
-			pfr_detach_table(pa->addr.p.tbl);
+			/* XXX: this could be unfinished pooladdr on pabuf */
+			if (pa->addr.p.tbl != NULL)
+				pfr_detach_table(pa->addr.p.tbl);
 			break;
 		}
 		if (pa->kif)