[src/netbsd-8]: src/sys/netinet Pull up following revision(s) (requested by o...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3fd693ff717f
branches:  netbsd-8
changeset: 851384:3fd693ff717f
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Feb 19 18:39:43 2018 +0000

description:
Pull up following revision(s) (requested by ozaki-r in ticket #557):
        sys/netinet/ip_output.c: 1.295
Keep a pointer to the interface of the multicast membership, because the
multicast element itself might go away in in_delmulti (but the interface
can't because we hold the lock). From ozaki-r@

diffstat:

 sys/netinet/ip_output.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r feca2b948283 -r 3fd693ff717f sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c   Mon Feb 19 18:33:38 2018 +0000
+++ b/sys/netinet/ip_output.c   Mon Feb 19 18:39:43 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_output.c,v 1.279.2.5 2018/01/13 21:52:06 snj Exp $  */
+/*     $NetBSD: ip_output.c,v 1.279.2.6 2018/02/19 18:39:43 snj Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.279.2.5 2018/01/13 21:52:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.279.2.6 2018/02/19 18:39:43 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1836,9 +1836,10 @@
         * Give up the multicast address record to which the
         * membership points.
         */
-       IFNET_LOCK(imo->imo_membership[i]->inm_ifp);
+       struct ifnet *inm_ifp = imo->imo_membership[i]->inm_ifp;
+       IFNET_LOCK(inm_ifp);
        in_delmulti(imo->imo_membership[i]);
-       IFNET_UNLOCK(imo->imo_membership[i]->inm_ifp);
+       IFNET_UNLOCK(inm_ifp);
 
        /*
         * Remove the gap in the membership array.