CVS commit: src/usr.sbin/npf

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Wed Aug 21 21:41:54 UTC 2019

Modified Files:
        src/usr.sbin/npf/npfctl: npfctl.c
        src/usr.sbin/npf/npftest/libnpftest: npf_mbuf_subr.c npf_nbuf_test.c

Log Message:
- npftest: fix a memleak in a unit test (standalone path only).
- Minor style fixes.  No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/npf/npfctl/npfctl.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c \
    src/usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.60 src/usr.sbin/npf/npfctl/npfctl.c:1.61
--- src/usr.sbin/npf/npfctl/npfctl.c:1.60	Thu Jul 25 00:48:55 2019
+++ src/usr.sbin/npf/npfctl/npfctl.c	Wed Aug 21 21:41:53 2019
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: npfctl.c,v 1.60 2019/07/25 00:48:55 rmind Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.61 2019/08/21 21:41:53 rmind Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -701,7 +701,7 @@ npfctl_open_dev(const char *path)
 	if (kernver != NPF_VERSION) {
 		errx(EXIT_FAILURE,
 		    "incompatible NPF interface version (%d, kernel %d)\n"
-		    "Hint: update %s?", NPF_VERSION, kernver, 
+		    "Hint: update %s?", NPF_VERSION, kernver,
 		    kernver > NPF_VERSION ? "userland" : "kernel");
 	}
 	return fd;

Index: src/usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c:1.9 src/usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c:1.10
--- src/usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c:1.9	Tue Jul 23 00:52:02 2019
+++ src/usr.sbin/npf/npftest/libnpftest/npf_mbuf_subr.c	Wed Aug 21 21:41:53 2019
@@ -101,6 +101,7 @@ npfkern_m_ensure_contig(struct mbuf **m0
 		memcpy(dptr, m->m_data, m->m_len);
 		dptr += m->m_len;
 	}
+	npfkern_m_freem(*m0);
 	*m0 = m1;
 	(void)len;
 	return true;
Index: src/usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c:1.9 src/usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c:1.10
--- src/usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c:1.9	Thu Jul 25 01:18:05 2019
+++ src/usr.sbin/npf/npftest/libnpftest/npf_nbuf_test.c	Wed Aug 21 21:41:53 2019
@@ -190,22 +190,22 @@ validate_mbuf_data(char *bufa, char *buf
 bool
 npf_nbuf_test(bool verbose)
 {
-	struct mbuf *m1, *m2;
+	struct mbuf *m;
 	char *bufa, *bufb;
 	unsigned n = 10000;
 	bool ok;
 
 	while (n--) {
-		m1 = mbuf_random_len(MBUF_CHAIN_LEN);
-		bufa = mbuf_getstring(m1);
-		bufb = parse_nbuf_chain(m1);
+		m = mbuf_random_len(MBUF_CHAIN_LEN);
+		bufa = mbuf_getstring(m);
+		bufb = parse_nbuf_chain(m);
 		ok = validate_mbuf_data(bufa, bufb);
 		CHECK_TRUE(ok);
 	}
 
-	m2 = mbuf_bytesize(MBUF_CHAIN_LEN);
-	bufa = mbuf_getstring(m2);
-	bufb = parse_nbuf_chain(m2);
+	m = mbuf_bytesize(MBUF_CHAIN_LEN);
+	bufa = mbuf_getstring(m);
+	bufb = parse_nbuf_chain(m);
 	ok = validate_mbuf_data(bufa, bufb);
 	CHECK_TRUE(ok);