From e1a0b830b54fb1e2d2d1aae3864f78c5c7206963 Mon Sep 17 00:00:00 2001 From: Bosko Milekic Date: Sat, 6 Jan 2001 20:44:39 +0000 Subject: [PATCH] Make sure musycc driver deals with the possibility of any type of mbuf allocation not succeeding. In this case, make sure the driver doesn't leak any memory by freeing all necessary buffers; make sure to loop and free all the previously allocated mbufs in this routine. Reviewed by: alfred --- sys/dev/musycc/musycc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/dev/musycc/musycc.c b/sys/dev/musycc/musycc.c index e1817fa1ce4..a992bcb5401 100644 --- a/sys/dev/musycc/musycc.c +++ b/sys/dev/musycc/musycc.c @@ -1204,7 +1204,17 @@ musycc_connect(hook_p hook) sc->mdt[ch][i].data = 0; MGETHDR(m, M_TRYWAIT, MT_DATA); + if (m == NULL) + goto errfree; MCLGET(m, M_TRYWAIT); + if ((m->m_flags M_EXT) == 0) { + /* We've waited mbuf_wait and still got nothing. + We're calling with M_TRYWAIT anyway - a little + defensive programming costs us very little - if + anything at all in the case of error. */ + m_free(m); + goto errfree; + } sc->mdr[ch][i].m = m; sc->mdr[ch][i].data = vtophys(m->m_data); sc->mdr[ch][i].status = 1600; /* MTU */ @@ -1224,6 +1234,16 @@ musycc_connect(hook_p hook) hook->peer->flags |= HK_QUEUE; return (0); + +errfree: + while (i > 0) { + /* Don't leak all the previously allocated mbufs in this loop */ + i--; + m_free(sc->mdr[ch][i].m); + } + FREE(sc->mdt[ch], M_MUSYCC); + FREE(sc->mdr[ch], M_MUSYCC); + return (ENOBUFS); } static int