CVS commit: src/sys/net

[Shoichi YAMAGUCHI]

Module Name:    src
Committed By:   yamaguchi
Date:           Tue Jul  6 02:34:12 UTC 2021

Modified Files:
        src/sys/net: if_vlan.c

Log Message:
vlan: added NULL check for the parent interface

The pointer may set to NULL by vlan_unconfig
while packet processing


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/net/if_vlan.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/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.155 src/sys/net/if_vlan.c:1.156
--- src/sys/net/if_vlan.c:1.155	Tue Jul  6 01:16:01 2021
+++ src/sys/net/if_vlan.c	Tue Jul  6 02:34:12 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vlan.c,v 1.155 2021/07/06 01:16:01 yamaguchi Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.156 2021/07/06 02:34:12 yamaguchi Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.155 2021/07/06 01:16:01 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.156 2021/07/06 02:34:12 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1328,6 +1328,12 @@ vlan_start(struct ifnet *ifp)
 	mib = vlan_getref_linkmib(ifv, &psref);
 	if (mib == NULL)
 		return;
+
+	if (__predict_false(mib->ifvm_p == NULL)) {
+		vlan_putref_linkmib(mib, &psref);
+		return;
+	}
+
 	p = mib->ifvm_p;
 	ec = (void *)mib->ifvm_p;
 
@@ -1471,6 +1477,12 @@ vlan_transmit(struct ifnet *ifp, struct 
 		return ENETDOWN;
 	}
 
+	if (__predict_false(mib->ifvm_p == NULL)) {
+		vlan_putref_linkmib(mib, &psref);
+		m_freem(m);
+		return ENETDOWN;
+	}
+
 	p = mib->ifvm_p;
 	ec = (void *)mib->ifvm_p;