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

As pointed out by Greg Troxel, ifmedia_entrys were allocated with 

malloc_type M_IFADDR and freed with malloc_type M_DEVBUF.  This
causes a panic(9) in DIAGNOSTIC kernels.  Add malloc_type M_IFMEDIA
and use it for both malloc'ing and free'ing ifmedia_entrys.
This commit is contained in:
dyoung 2004-12-08 20:37:43 +00:00
parent 8a90e8bcc4
commit a8699ab9a4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/net/if_media.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_media.c,v 1.22 2004/04/09 20:44:57 thorpej Exp $ */
/* $NetBSD: if_media.c,v 1.23 2004/12/08 20:37:43 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.22 2004/04/09 20:44:57 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.23 2004/12/08 20:37:43 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -108,6 +108,8 @@ int ifmedia_debug = 0;
static void ifmedia_printword(int);
#endif
MALLOC_DEFINE(M_IFMEDIA, "ifmedia", "interface media state");
/*
* Initialize if_media struct for a specific interface instance.
*/
@ -144,7 +146,7 @@ ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux)
}
#endif
entry = malloc(sizeof(*entry), M_IFADDR, M_NOWAIT);
entry = malloc(sizeof(*entry), M_IFMEDIA, M_NOWAIT);
if (entry == NULL)
panic("ifmedia_add: can't malloc entry");
@ -394,7 +396,7 @@ ifmedia_delete_instance(struct ifmedia *ifm, u_int inst)
if (inst == IFM_INST_ANY ||
inst == IFM_INST(ife->ifm_media)) {
TAILQ_REMOVE(&ifm->ifm_list, ife, ifm_list);
free(ife, M_DEVBUF);
free(ife, M_IFMEDIA);
}
}
}