Module Name: src
Committed By: maxv
Date: Mon Jun 22 16:39:56 UTC 2020
Modified Files:
src/sys/net: pfil.c
Log Message:
pfil_psz gets dropped by the compiler because it is unused if !NET_MPSAFE,
so add an #ifdef around it, not to leak memory. Found by kLSan.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/net/pfil.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/pfil.c
diff -u src/sys/net/pfil.c:1.38 src/sys/net/pfil.c:1.39
--- src/sys/net/pfil.c:1.38 Mon Apr 27 23:35:40 2020
+++ src/sys/net/pfil.c Mon Jun 22 16:39:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pfil.c,v 1.38 2020/04/27 23:35:40 nat Exp $ */
+/* $NetBSD: pfil.c,v 1.39 2020/06/22 16:39:56 maxv Exp $ */
/*
* Copyright (c) 2013 Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pfil.c,v 1.38 2020/04/27 23:35:40 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pfil.c,v 1.39 2020/06/22 16:39:56 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_net_mpsafe.h"
@@ -86,13 +86,17 @@ static LIST_HEAD(, pfil_head) pfil_head_
static kmutex_t pfil_mtx __cacheline_aligned;
static struct psref_class *pfil_psref_class __read_mostly;
+#ifdef NET_MPSAFE
static pserialize_t pfil_psz;
+#endif
void
pfil_init(void)
{
mutex_init(&pfil_mtx, MUTEX_DEFAULT, IPL_NONE);
+#ifdef NET_MPSAFE
pfil_psz = pserialize_create();
+#endif
pfil_psref_class = psref_class_create("pfil", IPL_SOFTNET);
}
