CVS commit: src/sys

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Wed Jul  6 00:30:55 UTC 2016

Modified Files:
        src/sys/netinet: in_gif.c
        src/sys/netinet6: in6_gif.c

Log Message:
Apply m_get_rcvif_psref (kill m_get_rcvif_NOMPSAFE)


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.77 -r1.78 src/sys/netinet6/in6_gif.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_gif.c
diff -u src/sys/netinet/in_gif.c:1.78 src/sys/netinet/in_gif.c:1.79
--- src/sys/netinet/in_gif.c:1.78	Mon Jul  4 04:22:47 2016
+++ src/sys/netinet/in_gif.c	Wed Jul  6 00:30:55 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_gif.c,v 1.78 2016/07/04 04:22:47 knakahara Exp $	*/
+/*	$NetBSD: in_gif.c,v 1.79 2016/07/06 00:30:55 ozaki-r Exp $	*/
 /*	$KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.78 2016/07/04 04:22:47 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.79 2016/07/06 00:30:55 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -349,15 +349,21 @@ gif_encapcheck4(struct mbuf *m, int off,
 {
 	struct ip ip;
 	struct gif_softc *sc;
-	struct ifnet *ifp;
+	struct ifnet *ifp = NULL;
+	int r;
+	struct psref psref;
 
 	/* sanity check done in caller */
 	sc = arg;
 
 	m_copydata(m, 0, sizeof(ip), &ip);
-	ifp = ((m->m_flags & M_PKTHDR) != 0) ? m_get_rcvif_NOMPSAFE(m) : NULL;
+	if ((m->m_flags & M_PKTHDR) != 0)
+		ifp = m_get_rcvif_psref(m, &psref);
+
+	r = gif_validate4(&ip, sc, ifp);
 
-	return gif_validate4(&ip, sc, ifp);
+	m_put_rcvif_psref(ifp, &psref);
+	return r;
 }
 #endif
 

Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.77 src/sys/netinet6/in6_gif.c:1.78
--- src/sys/netinet6/in6_gif.c:1.77	Mon Jul  4 04:22:47 2016
+++ src/sys/netinet6/in6_gif.c	Wed Jul  6 00:30:55 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_gif.c,v 1.77 2016/07/04 04:22:47 knakahara Exp $	*/
+/*	$NetBSD: in6_gif.c,v 1.78 2016/07/06 00:30:55 ozaki-r Exp $	*/
 /*	$KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.77 2016/07/04 04:22:47 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.78 2016/07/06 00:30:55 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -349,15 +349,21 @@ gif_encapcheck6(struct mbuf *m, int off,
 {
 	struct ip6_hdr ip6;
 	struct gif_softc *sc;
-	struct ifnet *ifp;
+	struct ifnet *ifp = NULL;
+	int r;
+	struct psref psref;
 
 	/* sanity check done in caller */
 	sc = arg;
 
 	m_copydata(m, 0, sizeof(ip6), (void *)&ip6);
-	ifp = ((m->m_flags & M_PKTHDR) != 0) ? m_get_rcvif_NOMPSAFE(m) : NULL;
+	if ((m->m_flags & M_PKTHDR) != 0)
+		ifp = m_get_rcvif_psref(m, &psref);
+
+	r = gif_validate6(&ip6, sc, ifp);
 
-	return gif_validate6(&ip6, sc, ifp);
+	m_put_rcvif_psref(ifp, &psref);
+	return r;
 }
 #endif