Module Name: src
Committed By: ryo
Date: Sat Dec 31 09:41:05 UTC 2016
Modified Files:
src/sys/netinet: in.c
src/sys/netinet6: in6.c
Log Message:
In the case of SIOCDIFADDR, call pfil_run_addrhooks before release ia.
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/sys/netinet/in.c
cvs rdiff -u -r1.227 -r1.228 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.193 src/sys/netinet/in.c:1.194
--- src/sys/netinet/in.c:1.193 Tue Dec 27 10:53:11 2016
+++ src/sys/netinet/in.c Sat Dec 31 09:41:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.193 2016/12/27 10:53:11 ozaki-r Exp $ */
+/* $NetBSD: in.c,v 1.194 2016/12/31 09:41:05 ryo 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.193 2016/12/27 10:53:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.194 2016/12/31 09:41:05 ryo Exp $");
#include "arp.h"
@@ -668,10 +668,10 @@ in_control0(struct socket *so, u_long cm
break;
case SIOCDIFADDR:
+ pfil_run_addrhooks(if_pfil, cmd, iatoifa(ia));
ia4_release(ia, &psref);
in_purgeaddr(&ia->ia_ifa);
ia = NULL;
- run_hook = true;
break;
#ifdef MROUTING
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.227 src/sys/netinet6/in6.c:1.228
--- src/sys/netinet6/in6.c:1.227 Tue Dec 27 10:53:12 2016
+++ src/sys/netinet6/in6.c Sat Dec 31 09:41:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.227 2016/12/27 10:53:12 ozaki-r Exp $ */
+/* $NetBSD: in6.c,v 1.228 2016/12/31 09:41:05 ryo 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.227 2016/12/27 10:53:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.228 2016/12/31 09:41:05 ryo Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -709,10 +709,10 @@ in6_control1(struct socket *so, u_long c
}
case SIOCDIFADDR_IN6:
+ pfil_run_addrhooks(if_pfil, cmd, (struct ifaddr *)ia);
ia6_release(ia, &psref);
in6_purgeaddr(&ia->ia_ifa);
ia = NULL;
- run_hooks = true;
break;
default:
