Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m_free -> m_freem, m_copyback could have added mbufs in the chain

Browse Source
This commit is contained in:
maxv 2018-04-18 14:56:35 +00:00
parent 02a6b07753
commit e30e5e83ea
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/sdmmc/sbt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbt.c,v 1.5 2016/07/14 04:00:46 msaitoh Exp $ */
/* $NetBSD: sbt.c,v 1.6 2018/04/18 14:56:35 maxv Exp $ */
/* $OpenBSD: sbt.c,v 1.9 2007/06/19 07:59:57 uwe Exp $ */
/*
@ -20,7 +20,7 @@
/* Driver for Type-A/B SDIO Bluetooth cards */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.5 2016/07/14 04:00:46 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.6 2018/04/18 14:56:35 maxv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -357,7 +357,7 @@ sbt_intr(void *arg)
m->m_len = MIN(MHLEN, m->m_pkthdr.len);
} else {
DPRINTF(("%s: sbt_intr: m_copyback failed\n", DEVNAME(sc)));
m_free(m);
m_freem(m);
m = NULL;
}
@ -383,7 +383,7 @@ eoi:
DPRINTF(("%s: recv 0x%x packet (%d bytes)\n",
DEVNAME(sc), sc->sc_buf[0], m->m_pkthdr.len));
sc->sc_stats.err_rx++;
m_free(m);
m_freem(m);
break;
}
} else

6
sys/dev/usb/ubt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ubt.c,v 1.60 2018/01/21 13:57:12 skrll Exp $ */
/* $NetBSD: ubt.c,v 1.61 2018/04/18 15:01:03 maxv Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.60 2018/01/21 13:57:12 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.61 2018/04/18 15:01:03 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@ -1528,7 +1528,7 @@ ubt_mbufload(uint8_t *buf, int count, uint8_t type)
m->m_pkthdr.len = m->m_len = MHLEN;
m_copyback(m, 1, count, buf); // (extends if necessary)
if (m->m_pkthdr.len != MAX(MHLEN, count + 1)) {
m_free(m);
m_freem(m);
return NULL;
}