Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix vlan panic when vlan is re-configured without destroy.

Browse Source 
E.g. the following operation causes this panic.
    ====================
    # ifconfig vlan0 create
    # ifconfig vlan0 vlan 1 vlanif ixg3
    # ifconfig vlan1 create
    # ifconfig vlan1 vlan 1 vlanif ixg2
    # ifconfig vlan1 -vlanif
    # ifconfig vlan1 vlan 1 vlanif ixg2

    panic: kernel diagnostic assertion "new->ple_next == NULL" failed: file "/git/netbsd-src/sys/sys/pslist.h", line 118
    ====================

Pointed out and tested by msaitoh@n.o, fixed by s-yamaguchi@IIJ, thanks.

XXX need pullup-8
This commit is contained in:
knakahara 2017-10-19 07:02:00 +00:00
parent 8427810e88
commit d71c6de37e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/if_vlan.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_vlan.c,v 1.103 2017/10/12 02:40:59 ozaki-r Exp $ */
/* $NetBSD: if_vlan.c,v 1.104 2017/10/19 07:02:00 knakahara 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.103 2017/10/12 02:40:59 ozaki-r Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.104 2017/10/19 07:02:00 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@ -478,6 +478,7 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t tag)
*/
ifv->ifv_if.if_type = p->if_type;
PSLIST_ENTRY_INIT(ifv, ifv_hash);
idx = tag_hash_func(tag, ifv_hash.mask);
mutex_enter(&ifv_hash.lock);
@ -582,6 +583,7 @@ vlan_unconfig_locked(struct ifvlan *ifv, struct ifvlan_linkmib *nmib)
PSLIST_WRITER_REMOVE(ifv, ifv_hash);
pserialize_perform(vlan_psz);
mutex_exit(&ifv_hash.lock);
PSLIST_ENTRY_DESTROY(ifv, ifv_hash);
vlan_linkmib_update(ifv, nmib);