From 742ac41fc9f9ecb27ec2af86bdbd89cf72246348 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 13 May 2016 08:44:59 +0000 Subject: [PATCH] MFC r298677: r298677 (by cem): subr_mbpool: Don't free bogus pointer in error paths An mbpool is allocated with a contiguous array of mbpages. Freeing an individual mbpage has never been valid. Don't do it. This bug has been present since this code was introduced in r117624 (2003). CID: 1009687 git-svn-id: svn://svn.freebsd.org/base/stable/10@299625 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/kern/subr_mbpool.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/subr_mbpool.c b/sys/kern/subr_mbpool.c index 0b8cda624..f0b44d20e 100644 --- a/sys/kern/subr_mbpool.c +++ b/sys/kern/subr_mbpool.c @@ -210,16 +210,13 @@ mbp_alloc_page(struct mbpool *p) pg = &p->pages[p->npages]; error = bus_dmamem_alloc(p->dmat, &pg->va, BUS_DMA_NOWAIT, &pg->map); - if (error != 0) { - free(pg, M_MBPOOL); + if (error != 0) return; - } error = bus_dmamap_load(p->dmat, pg->map, pg->va, p->page_size, mbp_callback, &pg->phy, 0); if (error != 0) { bus_dmamem_free(p->dmat, pg->va, pg->map); - free(pg, M_MBPOOL); return; } -- 2.45.0