diff options
| author |   art <art@openbsd.org> | 2001-05-27 01:32:21 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2001-05-27 01:32:21 +0000 |
| commit | da362406fb99b22da620186bd93363c66e787cc6 (patch) | |
| tree | 9a4558a1b50b18a4f34463bf1003d8972da646f0 | |
| parent | New tags. (diff) | |
| download | wireguard-openbsd-da362406fb99b22da620186bd93363c66e787cc6.tar.xz wireguard-openbsd-da362406fb99b22da620186bd93363c66e787cc6.zip | |
Put back the fix for the possible leak and fix another bug
that the fix uncovered.
The tx descriptors were not initialized when allocated. The initialization
was done in fxp_init, but the first thing fxp_init does is to call fxp_stop
and fxp_stop expects the tx descriptors to be already initialized.
How did this ever work?
| -rw-r--r-- | sys/dev/ic/fxp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index b890d1188c2..3428da957b4 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.16 2001/05/26 19:40:37 deraadt Exp $ */ +/* $OpenBSD: fxp.c,v 1.17 2001/05/27 01:32:21 art Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -316,6 +316,7 @@ fxp_attach_common(sc, enaddr, intrstr) M_DEVBUF, M_NOWAIT); if (sc->cbl_base == NULL) goto fail; + memset(sc->cbl_base, 0, sizeof(struct fxp_cb_tx) * FXP_NTXCB); sc->fxp_stats = malloc(sizeof(struct fxp_stats), M_DEVBUF, M_NOWAIT); if (sc->fxp_stats == NULL) @@ -995,10 +996,11 @@ fxp_stop(sc, drain) /* * Release any xmit buffers. */ - for (txp = sc->cbl_first; txp != NULL && txp->mb_head != NULL; - txp = txp->next) { - m_freem(txp->mb_head); - txp->mb_head = NULL; + txp = sc->cbl_base; + for (i = 0; i < FXP_NTXCB; i++) { + if (txp[i].mb_head != NULL) + m_freem(txp[i].mb_head); + txp[i].mb_head = NULL; } sc->tx_queued = 0; |