Patchwork slirp: fix use-after-free

login
register
mail settings
Submitter Mark McLoughlin
Date Nov. 20, 2009, 6:13 p.m.
Message ID <1258740790-26036-1-git-send-email-markmc@redhat.com>
Download mbox | patch
Permalink /patch/38934/
State New
Headers show

Comments

Mark McLoughlin - Nov. 20, 2009, 6:13 p.m.
460fec67ee introduced a use-after free in slirp.

Cc: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---

Untested fix, but it's obvious.

Also, this is needed on stable-0.11.

 slirp/mbuf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/slirp/mbuf.c b/slirp/mbuf.c
index 7652fea..87508ba 100644
--- a/slirp/mbuf.c
+++ b/slirp/mbuf.c
@@ -95,8 +95,8 @@  m_free(struct mbuf *m)
 	 * Either free() it or put it on the free list
 	 */
 	if (m->m_flags & M_DOFREE) {
-		free(m);
 		m->slirp->mbuf_alloced--;
+		free(m);
 	} else if ((m->m_flags & M_FREELIST) == 0) {
 		insque(m,&m->slirp->m_freelist);
 		m->m_flags = M_FREELIST; /* Clobber other flags */