[src/netbsd-7-0]: src/sys/net Pull up following revision(s) (requested by joe...

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

details:   https://anonhg.NetBSD.org/src/rev/d09c58dd2546
branches:  netbsd-7-0
changeset: 801247:d09c58dd2546
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 03 12:33:12 2016 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #1279):
        sys/net/if_vlan.c: revision 1.92
Don't check parent capabilities when a parent interface hasn't been
assigned.

diffstat:

 sys/net/if_vlan.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r fbcdc6973a89 -r d09c58dd2546 sys/net/if_vlan.c
--- a/sys/net/if_vlan.c Sat Dec 03 12:24:27 2016 +0000
+++ b/sys/net/if_vlan.c Sat Dec 03 12:33:12 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vlan.c,v 1.70.2.3 2015/04/23 19:23:45 snj Exp $     */
+/*     $NetBSD: if_vlan.c,v 1.70.2.3.2.1 2016/12/03 12:33:12 martin 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.70.2.3 2015/04/23 19:23:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.70.2.3.2.1 2016/12/03 12:33:12 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -550,6 +550,10 @@
        case SIOCSIFCAP:
                ifcr = data;
                /* make sure caps are enabled on parent */
+               if (ifv->ifv_p == NULL) {
+                       error = EINVAL;
+                       break;
+               }
                if ((ifv->ifv_p->if_capenable & ifcr->ifcr_capenable) !=
                    ifcr->ifcr_capenable) {
                        error = EINVAL;