diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-03-21 00:18:55 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-03-21 00:18:55 +0000 |
| commit | 9a3f69d151bba1d087d38b790d50ba4970018753 (patch) | |
| tree | 0166c82427a49a6353db6c927e2f3d7e2e903b9d /sys | |
| parent | 09107d26f8e6335a793658be5c26b78625d9a6ea (diff) | |
Plug a memory leak in vnet(4) ioctl code path.
ok kettenis@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc64/dev/vnet.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/sparc64/dev/vnet.c b/sys/arch/sparc64/dev/vnet.c index 0bc48012e32..20a6744ccc7 100644 --- a/sys/arch/sparc64/dev/vnet.c +++ b/sys/arch/sparc64/dev/vnet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vnet.c,v 1.54 2016/02/26 13:41:51 kettenis Exp $ */ +/* $OpenBSD: vnet.c,v 1.55 2016/03/21 00:18:54 stsp Exp $ */ /* * Copyright (c) 2009, 2015 Mark Kettenis * @@ -169,6 +169,7 @@ struct vnet_softc { struct ldc_map *sc_lm; struct vnet_dring *sc_vd; struct vnet_soft_desc *sc_vsd; +#define VNET_NUM_SOFT_DESC 128 size_t sc_peer_desc_size; struct ldc_cookie sc_peer_dring_cookie; @@ -1399,10 +1400,10 @@ vnet_init(struct ifnet *ifp) return; } - sc->sc_vd = vnet_dring_alloc(sc->sc_dmatag, 128); + sc->sc_vd = vnet_dring_alloc(sc->sc_dmatag, VNET_NUM_SOFT_DESC); if (sc->sc_vd == NULL) return; - sc->sc_vsd = malloc(128 * sizeof(*sc->sc_vsd), M_DEVBUF, + sc->sc_vsd = malloc(VNET_NUM_SOFT_DESC * sizeof(*sc->sc_vsd), M_DEVBUF, M_NOWAIT|M_ZERO); if (sc->sc_vsd == NULL) return; @@ -1454,6 +1455,8 @@ vnet_stop(struct ifnet *ifp) lc->lc_tx_state = lc->lc_rx_state = LDC_CHANNEL_DOWN; vnet_ldc_reset(lc); + free(sc->sc_vsd, M_DEVBUF, VNET_NUM_SOFT_DESC * sizeof(*sc->sc_vsd)); + vnet_dring_free(sc->sc_dmatag, sc->sc_vd); hv_ldc_set_map_table(lc->lc_id, 0, 0); |