diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c
index 0d7f7631e91b..947193599b31 100644
--- a/tests/sys/netpfil/pf/ioctl/validation.c
+++ b/tests/sys/netpfil/pf/ioctl/validation.c
@@ -1,859 +1,898 @@
 /*-
  * Copyright (c) 2018	Kristof Provost <kp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/pfvar.h>
 
 #include <fcntl.h>
 #include <stdio.h>
 
 #include <atf-c.h>
 
 static int dev;
 
 #define COMMON_HEAD() \
 	if (modfind("pf") == -1) \
 		atf_tc_skip("pf not loaded"); \
 	dev = open("/dev/pf", O_RDWR); \
 	if (dev == -1) \
 		atf_tc_skip("Failed to open /dev/pf");
 
 #define COMMON_CLEANUP() \
 	close(dev);
 
 static void
 common_init_tbl(struct pfr_table *tbl)
 {
 	bzero(tbl, sizeof(struct pfr_table));
 	strcpy(tbl->pfrt_anchor, "anchor");
 	strcpy(tbl->pfrt_name, "name");
 	tbl->pfrt_flags = 0;
 	tbl->pfrt_fback = 0;
 }
 
 ATF_TC_WITH_CLEANUP(addtables);
 ATF_TC_HEAD(addtables, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(addtables, tc)
 {
 	struct pfioc_table io;
 	struct pfr_table tbl;
 	struct pfr_table tbls[4];
 	int flags;
 
 	COMMON_HEAD();
 
 	flags = 0;
 
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = flags;
 	io.pfrio_buffer = &tbl;
 	io.pfrio_esize = sizeof(tbl);
 
 	/* Negative size */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRADDTABLES, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRADDTABLES, &io) == 0)
 		atf_tc_fail("Request with size 1 << 24 succeeded");
 
 	/* NULL buffer */
 	io.pfrio_size = 1;
 	io.pfrio_buffer = NULL;
 	if (ioctl(dev, DIOCRADDTABLES, &io) == 0)
 		atf_tc_fail("Request with NULL buffer succeeded");
 
 	/* This can provoke a memory leak, see r331225. */
 	io.pfrio_size = 4;
 	for (int i = 0; i < io.pfrio_size; i++)
 		common_init_tbl(&tbls[i]);
 
 	io.pfrio_buffer = &tbls;
 	ioctl(dev, DIOCRADDTABLES, &io);
 }
 
 ATF_TC_CLEANUP(addtables, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(deltables);
 ATF_TC_HEAD(deltables, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(deltables, tc)
 {
 	struct pfioc_table io;
 	struct pfr_table tbl;
 	int flags;
 
 	COMMON_HEAD();
 
 	flags = 0;
 
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = flags;
 	io.pfrio_buffer = &tbl;
 	io.pfrio_esize = sizeof(tbl);
 
 	/* Negative size */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRDELTABLES, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRDELTABLES, &io) == 0)
 		atf_tc_fail("Request with size 1 << 24 succeeded");
 
 	/* NULL buffer */
 	io.pfrio_size = 1;
 	io.pfrio_buffer = NULL;
 	if (ioctl(dev, DIOCRDELTABLES, &io) == 0)
 		atf_tc_fail("Request with NULL buffer succeeded");
 }
 
 ATF_TC_CLEANUP(deltables, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(gettables);
 ATF_TC_HEAD(gettables, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(gettables, tc)
 {
 	struct pfioc_table io;
 	struct pfr_table tbl;
 	int flags;
 
 	COMMON_HEAD();
 
 	flags = 0;
 
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = flags;
 	io.pfrio_buffer = &tbl;
 	io.pfrio_esize = sizeof(tbl);
 
 	/* Negative size. This will succeed, because the kernel will not copy
 	 * tables than it has. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRGETTABLES, &io) != 0)
 		atf_tc_fail("Request with size -1 failed");
 
 	/* Overly large size. See above. */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRGETTABLES, &io) != 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 }
 
 ATF_TC_CLEANUP(gettables, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(gettstats);
 ATF_TC_HEAD(gettstats, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(gettstats, tc)
 {
 	struct pfioc_table io;
 	struct pfr_tstats stats;
 	int flags;
 
 	COMMON_HEAD();
 
 	flags = 0;
 
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = flags;
 	io.pfrio_buffer = &stats;
 	io.pfrio_esize = sizeof(stats);
 
 	/* Negative size. This will succeed, because the kernel will not copy
 	 * tables than it has. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRGETTSTATS, &io) != 0)
 		atf_tc_fail("Request with size -1 failed");
 
 	/* Overly large size. See above. */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRGETTSTATS, &io) != 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 }
 
 ATF_TC_CLEANUP(gettstats, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(clrtstats);
 ATF_TC_HEAD(clrtstats, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(clrtstats, tc)
 {
 	struct pfioc_table io;
 	struct pfr_table tbl;
 	int flags;
 
 	COMMON_HEAD();
 
 	flags = 0;
 
 	common_init_tbl(&tbl);
 
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = flags;
 	io.pfrio_buffer = &tbl;
 	io.pfrio_esize = sizeof(tbl);
 
 	/* Negative size. This will succeed, because the kernel will not copy
 	 * tables than it has. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRCLRTSTATS, &io) != 0)
 		atf_tc_fail("Request with size -1 failed ");
 
 	/* Overly large size. See above. */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRCLRTSTATS, &io) != 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 
 	io.pfrio_size = sizeof(tbl);
 	io.pfrio_buffer = NULL;
 	if (ioctl(dev, DIOCRCLRTSTATS, &io) == 0)
 		atf_tc_fail("Request with NULL buffer succeeded");
 }
 
 ATF_TC_CLEANUP(clrtstats, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(settflags);
 ATF_TC_HEAD(settflags, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(settflags, tc)
 {
 	struct pfioc_table io;
 	struct pfr_table tbl;
 	int flags;
 
 	COMMON_HEAD();
 
 	flags = 0;
 
 	common_init_tbl(&tbl);
 
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = flags;
 	io.pfrio_buffer = &tbl;
 	io.pfrio_esize = sizeof(tbl);
 
 	/* Negative size. This will succeed, because the kernel will not copy
 	 * tables than it has. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRSETTFLAGS, &io) != 0)
 		atf_tc_fail("Request with size -1 failed");
 
 	/* Overly large size. See above. */
 	io.pfrio_size = 1 << 28;
 	if (ioctl(dev, DIOCRSETTFLAGS, &io) != 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 
 	/* NULL buffer */
 	io.pfrio_buffer = NULL;
 	if (ioctl(dev, DIOCRSETTFLAGS, &io) != -1)
 		atf_tc_fail("Request with NULL buffer succeeded");
 }
 
 ATF_TC_CLEANUP(settflags, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(addaddrs);
 ATF_TC_HEAD(addaddrs, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(addaddrs, tc)
 {
 	struct pfioc_table io;
 	struct pfr_addr addr;
 
 	COMMON_HEAD();
 
 	bzero(&addr, sizeof(addr));
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = 0;
 	io.pfrio_buffer = &addr;
 	io.pfrio_esize = sizeof(addr);
 
 	/* Negative size. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRADDADDRS, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size. */
 	io.pfrio_size = 1 << 28;
 	if (ioctl(dev, DIOCRADDADDRS, &io) == 0)
 		atf_tc_fail("Reuqest with size 1 << 28 failed");
 }
 
 ATF_TC_CLEANUP(addaddrs, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(deladdrs);
 ATF_TC_HEAD(deladdrs, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(deladdrs, tc)
 {
 	struct pfioc_table io;
 	struct pfr_addr addr;
 
 	COMMON_HEAD();
 
 	bzero(&addr, sizeof(addr));
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = 0;
 	io.pfrio_buffer = &addr;
 	io.pfrio_esize = sizeof(addr);
 
 	/* Negative size. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRDELADDRS, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size. */
 	io.pfrio_size = 1 << 28;
 	if (ioctl(dev, DIOCRDELADDRS, &io) == 0)
 		atf_tc_fail("Reuqest with size 1 << 28 failed");
 }
 
 ATF_TC_CLEANUP(deladdrs, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(setaddrs);
 ATF_TC_HEAD(setaddrs, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(setaddrs, tc)
 {
 	struct pfioc_table io;
 	struct pfr_addr addr;
 
 	COMMON_HEAD();
 
 	bzero(&addr, sizeof(addr));
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = 0;
 	io.pfrio_buffer = &addr;
 	io.pfrio_esize = sizeof(addr);
 
 	/* Negative size. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRSETADDRS, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size. */
 	io.pfrio_size = 1 << 28;
 	if (ioctl(dev, DIOCRSETADDRS, &io) == 0)
 		atf_tc_fail("Reuqest with size 1 << 28 failed");
 }
 
 ATF_TC_CLEANUP(setaddrs, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(getaddrs);
 ATF_TC_HEAD(getaddrs, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(getaddrs, tc)
 {
 	struct pfioc_table io;
 	struct pfr_addr addr;
 
 	COMMON_HEAD();
 
 	bzero(&addr, sizeof(addr));
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = 0;
 	io.pfrio_buffer = &addr;
 	io.pfrio_esize = sizeof(addr);
 
 	common_init_tbl(&io.pfrio_table);
 
 	/* Negative size. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRGETADDRS, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size. */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRGETADDRS, &io) == 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 }
 
 ATF_TC_CLEANUP(getaddrs, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(getastats);
 ATF_TC_HEAD(getastats, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(getastats, tc)
 {
 	struct pfioc_table io;
 	struct pfr_astats astats;
 
 	COMMON_HEAD();
 
 	bzero(&astats, sizeof(astats));
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = 0;
 	io.pfrio_buffer = &astats;
 	io.pfrio_esize = sizeof(astats);
 
 	common_init_tbl(&io.pfrio_table);
 
 	/* Negative size. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRGETASTATS, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size. */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRGETASTATS, &io) == 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 }
 
 ATF_TC_CLEANUP(getastats, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(clrastats);
 ATF_TC_HEAD(clrastats, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(clrastats, tc)
 {
 	struct pfioc_table io;
 	struct pfr_addr addr;
 
 	COMMON_HEAD();
 
 	bzero(&addr, sizeof(addr));
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = 0;
 	io.pfrio_buffer = &addr;
 	io.pfrio_esize = sizeof(addr);
 
 	common_init_tbl(&io.pfrio_table);
 
 	/* Negative size. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRCLRASTATS, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size. */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRCLRASTATS, &io) == 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 }
 
 ATF_TC_CLEANUP(clrastats, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(tstaddrs);
 ATF_TC_HEAD(tstaddrs, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(tstaddrs, tc)
 {
 	struct pfioc_table io;
 	struct pfr_addr addr;
 
 	COMMON_HEAD();
 
 	bzero(&addr, sizeof(addr));
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = 0;
 	io.pfrio_buffer = &addr;
 	io.pfrio_esize = sizeof(addr);
 
 	common_init_tbl(&io.pfrio_table);
 
 	/* Negative size. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRTSTADDRS, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size. */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRTSTADDRS, &io) == 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 }
 
 ATF_TC_CLEANUP(tstaddrs, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(inadefine);
 ATF_TC_HEAD(inadefine, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(inadefine, tc)
 {
 	struct pfioc_table io;
 	struct pfr_addr addr;
 
 	COMMON_HEAD();
 
 	bzero(&addr, sizeof(addr));
 	bzero(&io, sizeof(io));
 	io.pfrio_flags = 0;
 	io.pfrio_buffer = &addr;
 	io.pfrio_esize = sizeof(addr);
 
 	common_init_tbl(&io.pfrio_table);
 
 	/* Negative size. */
 	io.pfrio_size = -1;
 	if (ioctl(dev, DIOCRINADEFINE, &io) == 0)
 		atf_tc_fail("Request with size -1 succeeded");
 
 	/* Overly large size. */
 	io.pfrio_size = 1 << 24;
 	if (ioctl(dev, DIOCRINADEFINE, &io) == 0)
 		atf_tc_fail("Request with size 1 << 24 failed");
 }
 
 ATF_TC_CLEANUP(inadefine, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(igetifaces);
 ATF_TC_HEAD(igetifaces, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(igetifaces, tc)
 {
 	struct pfioc_iface io;
 	struct pfi_kif kif;
 
 	COMMON_HEAD();
 
 	bzero(&io, sizeof(io));
 	io.pfiio_flags = 0;
 	io.pfiio_buffer = &kif;
 	io.pfiio_esize = sizeof(kif);
 
 	/* Negative size */
 	io.pfiio_size = -1;
 	if (ioctl(dev, DIOCIGETIFACES, &io) == 0)
 		atf_tc_fail("request with size -1 succeeded");
 
 	/* Overflow size */
 	io.pfiio_size = 1 << 31;
 	if (ioctl(dev, DIOCIGETIFACES, &io) == 0)
 		atf_tc_fail("request with size 1 << 31 succeeded");
 }
 
 ATF_TC_CLEANUP(igetifaces, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(cxbegin);
 ATF_TC_HEAD(cxbegin, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(cxbegin, tc)
 {
 	struct pfioc_trans io;
 	struct pfioc_trans_e ioe;
 
 	COMMON_HEAD();
 
 	bzero(&io, sizeof(io));
 	io.esize = sizeof(ioe);
 	io.array = &ioe;
 
 	/* Negative size */
 	io.size = -1;
 	if (ioctl(dev, DIOCXBEGIN, &io) == 0)
 		atf_tc_fail("request with size -1 succeeded");
 
 	/* Overflow size */
 	io.size = 1 << 30;
 	if (ioctl(dev, DIOCXBEGIN, &io) == 0)
 		atf_tc_fail("request with size 1 << 30 succeeded");
 
 	/* NULL buffer */
 	io.size = 1;
 	io.array = NULL;
 	if (ioctl(dev, DIOCXBEGIN, &io) == 0)
 		atf_tc_fail("request with size -1 succeeded");
 }
 
 ATF_TC_CLEANUP(cxbegin, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(cxrollback);
 ATF_TC_HEAD(cxrollback, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(cxrollback, tc)
 {
 	struct pfioc_trans io;
 	struct pfioc_trans_e ioe;
 
 	COMMON_HEAD();
 
 	bzero(&io, sizeof(io));
 	io.esize = sizeof(ioe);
 	io.array = &ioe;
 
 	/* Negative size */
 	io.size = -1;
 	if (ioctl(dev, DIOCXROLLBACK, &io) == 0)
 		atf_tc_fail("request with size -1 succeeded");
 
 	/* Overflow size */
 	io.size = 1 << 30;
 	if (ioctl(dev, DIOCXROLLBACK, &io) == 0)
 		atf_tc_fail("request with size 1 << 30 succeeded");
 
 	/* NULL buffer */
 	io.size = 1;
 	io.array = NULL;
 	if (ioctl(dev, DIOCXROLLBACK, &io) == 0)
 		atf_tc_fail("request with size -1 succeeded");
 }
 
 ATF_TC_CLEANUP(cxrollback, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(commit);
 ATF_TC_HEAD(commit, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(commit, tc)
 {
 	struct pfioc_trans io;
 	struct pfioc_trans_e ioe;
 
 	COMMON_HEAD();
 
 	bzero(&io, sizeof(io));
 	io.esize = sizeof(ioe);
 	io.array = &ioe;
 
 	/* Negative size */
 	io.size = -1;
 	if (ioctl(dev, DIOCXCOMMIT, &io) == 0)
 		atf_tc_fail("request with size -1 succeeded");
 
 	/* Overflow size */
 	io.size = 1 << 30;
 	if (ioctl(dev, DIOCXCOMMIT, &io) == 0)
 		atf_tc_fail("request with size 1 << 30 succeeded");
 
 	/* NULL buffer */
 	io.size = 1;
 	io.array = NULL;
 	if (ioctl(dev, DIOCXCOMMIT, &io) == 0)
 		atf_tc_fail("request with size -1 succeeded");
 }
 
 ATF_TC_CLEANUP(commit, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(getsrcnodes);
 ATF_TC_HEAD(getsrcnodes, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(getsrcnodes, tc)
 {
 	struct pfioc_src_nodes psn;
 
 	COMMON_HEAD();
 
 	bzero(&psn, sizeof(psn));
 
 	psn.psn_len = -1;
 	if (ioctl(dev, DIOCGETSRCNODES, &psn) != 0)
 		atf_tc_fail("request with size -1 failed");
 
 	psn.psn_len = 1 << 30;
 	if (ioctl(dev, DIOCGETSRCNODES, &psn) != 0)
 		atf_tc_fail("request with size << 30 failed");
 
 	psn.psn_len = 1 << 31;
 	if (ioctl(dev, DIOCGETSRCNODES, &psn) != 0)
 		atf_tc_fail("request with size << 30 failed");
 }
 
 ATF_TC_CLEANUP(getsrcnodes, tc)
 {
 	COMMON_CLEANUP();
 }
 
 ATF_TC_WITH_CLEANUP(tag);
 ATF_TC_HEAD(tag, tc)
 {
 	atf_tc_set_md_var(tc, "require.user", "root");
 }
 
 ATF_TC_BODY(tag, tc)
 {
 	struct pfioc_rule rule;
 
 	COMMON_HEAD();
 
 	memset(&rule, 0x42, sizeof(rule));
 
 	rule.ticket = 0;
 	rule.pool_ticket = 0;
 	rule.anchor[0] = 0;
 
 	rule.rule.return_icmp = 0;
 	bzero(&rule.rule.src, sizeof(rule.rule.src));
 	bzero(&rule.rule.dst, sizeof(rule.rule.dst));
 
 	rule.rule.ifname[0] = 0;
 	rule.rule.action = 0;
 	rule.rule.rtableid = 0;
 
 	rule.rule.tagname[0] = 0;
 
 	for (int i = 0; i < 10; i++)
 		ioctl(dev, DIOCADDRULE, &rule);
 }
 
 ATF_TC_CLEANUP(tag, tc)
 {
 	COMMON_CLEANUP();
 }
 
+ATF_TC_WITH_CLEANUP(rpool_mtx);
+ATF_TC_HEAD(rpool_mtx, tc)
+{
+	atf_tc_set_md_var(tc, "require.user", "root");
+}
+
+ATF_TC_BODY(rpool_mtx, tc)
+{
+	struct pfioc_rule rule;
+
+	COMMON_HEAD();
+
+	memset(&rule, 0, sizeof(rule));
+
+	rule.ticket = 0;
+	rule.pool_ticket = 0;
+	rule.anchor[0] = 0;
+
+	rule.rule.return_icmp = 0;
+	bzero(&rule.rule.src, sizeof(rule.rule.src));
+	bzero(&rule.rule.dst, sizeof(rule.rule.dst));
+
+	rule.rule.ifname[0] = 0;
+	rule.rule.action = 0;
+	rule.rule.rtableid = 0;
+
+	rule.rule.tagname[0] = 0;
+	rule.rule.action = 42;
+
+	ioctl(dev, DIOCADDRULE, &rule);
+}
+
+ATF_TC_CLEANUP(rpool_mtx, tc)
+{
+	COMMON_CLEANUP();
+}
+
+
 ATF_TP_ADD_TCS(tp)
 {
 	ATF_TP_ADD_TC(tp, addtables);
 	ATF_TP_ADD_TC(tp, deltables);
 	ATF_TP_ADD_TC(tp, gettables);
 	ATF_TP_ADD_TC(tp, getastats);
 	ATF_TP_ADD_TC(tp, gettstats);
 	ATF_TP_ADD_TC(tp, clrtstats);
 	ATF_TP_ADD_TC(tp, settflags);
 	ATF_TP_ADD_TC(tp, addaddrs);
 	ATF_TP_ADD_TC(tp, deladdrs);
 	ATF_TP_ADD_TC(tp, setaddrs);
 	ATF_TP_ADD_TC(tp, getaddrs);
 	ATF_TP_ADD_TC(tp, clrastats);
 	ATF_TP_ADD_TC(tp, tstaddrs);
 	ATF_TP_ADD_TC(tp, inadefine);
 	ATF_TP_ADD_TC(tp, igetifaces);
 	ATF_TP_ADD_TC(tp, cxbegin);
 	ATF_TP_ADD_TC(tp, cxrollback);
 	ATF_TP_ADD_TC(tp, commit);
 	ATF_TP_ADD_TC(tp, getsrcnodes);
 	ATF_TP_ADD_TC(tp, tag);
+	ATF_TP_ADD_TC(tp, rpool_mtx);
 
 	return (atf_no_error());
 }