Module Name: src Committed By: snj Date: Sat Jan 13 21:52:07 UTC 2018
Modified Files: src/sys/netinet [netbsd-8]: ip_output.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #494): sys/netinet/ip_output.c: revision 1.291-1.292 - this is not python, we need braces - protect ifp locking against NULL -- from ozaki-r: use the proper ifp. XXX: perhaps push the lock in in_delmulti()? To generate a diff of this commit: cvs rdiff -u -r1.279.2.4 -r1.279.2.5 src/sys/netinet/ip_output.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/ip_output.c diff -u src/sys/netinet/ip_output.c:1.279.2.4 src/sys/netinet/ip_output.c:1.279.2.5 --- src/sys/netinet/ip_output.c:1.279.2.4 Tue Jan 2 10:56:58 2018 +++ src/sys/netinet/ip_output.c Sat Jan 13 21:52:06 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_output.c,v 1.279.2.4 2018/01/02 10:56:58 snj Exp $ */ +/* $NetBSD: ip_output.c,v 1.279.2.5 2018/01/13 21:52:06 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.4 2018/01/02 10:56:58 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.279.2.5 2018/01/13 21:52:06 snj Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1806,13 +1806,14 @@ ip_drop_membership(struct ip_moptions *i bound = curlwp_bind(); if (sopt->sopt_size == sizeof(struct ip_mreq)) error = ip_get_membership(sopt, &ifp, &psref, &ia, false); - else + else { #ifdef INET6 error = ip6_get_membership(sopt, &ifp, &psref, &ia, sizeof(ia)); #else error = EINVAL; goto out; #endif + } if (error) goto out; @@ -1835,9 +1836,9 @@ ip_drop_membership(struct ip_moptions *i * Give up the multicast address record to which the * membership points. */ - IFNET_LOCK(ifp); + IFNET_LOCK(imo->imo_membership[i]->inm_ifp); in_delmulti(imo->imo_membership[i]); - IFNET_UNLOCK(ifp); + IFNET_UNLOCK(imo->imo_membership[i]->inm_ifp); /* * Remove the gap in the membership array.