Module Name: src
Committed By: ozaki-r
Date: Tue Dec 27 10:53:12 UTC 2016
Modified Files:
src/sys/netinet: in.c
src/sys/netinet6: in6.c
Log Message:
Fix panic in pfil_run_hooks on bootup
XXX a kernel with pf still fails to boot up. Please someone fix it.
To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/sys/netinet/in.c
cvs rdiff -u -r1.226 -r1.227 src/sys/netinet6/in6.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/netinet/in.c
diff -u src/sys/netinet/in.c:1.192 src/sys/netinet/in.c:1.193
--- src/sys/netinet/in.c:1.192 Mon Dec 26 00:30:07 2016
+++ src/sys/netinet/in.c Tue Dec 27 10:53:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.192 2016/12/26 00:30:07 knakahara Exp $ */
+/* $NetBSD: in.c,v 1.193 2016/12/27 10:53:11 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.192 2016/12/26 00:30:07 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.193 2016/12/27 10:53:11 ozaki-r Exp $");
#include "arp.h"
@@ -705,8 +705,7 @@ in_control0(struct socket *so, u_long cm
if (error == 0) {
if (run_hook)
- (void)pfil_run_hooks(if_pfil,
- (struct mbuf **)cmd, ifp, PFIL_IFADDR);
+ pfil_run_addrhooks(if_pfil, cmd, iatoifa(ia));
} else if (newifaddr) {
KASSERT(ia != NULL);
in_purgeaddr(&ia->ia_ifa);
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.226 src/sys/netinet6/in6.c:1.227
--- src/sys/netinet6/in6.c:1.226 Wed Dec 21 08:47:02 2016
+++ src/sys/netinet6/in6.c Tue Dec 27 10:53:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.226 2016/12/21 08:47:02 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.227 2016/12/27 10:53:12 ozaki-r Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.226 2016/12/21 08:47:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.227 2016/12/27 10:53:12 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -719,10 +719,9 @@ in6_control1(struct socket *so, u_long c
error = ENOTTY;
}
release:
- ia6_release(ia, &psref);
-
if (run_hooks)
- pfil_run_hooks(if_pfil, (struct mbuf **)cmd, ifp, PFIL_IFADDR);
+ pfil_run_addrhooks(if_pfil, cmd, (struct ifaddr *)ia);
+ ia6_release(ia, &psref);
out:
curlwp_bindx(bound);
return error;
