d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mbuf mapping errors in wpi_cmd2() + add check for nsegs

Browse Source 
PR:		kern/197143
Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>
This commit is contained in:
adrian 2015-03-15 20:09:47 +00:00
parent 36adcb3650
commit 24a7a92221
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/wpi/if_wpi.c
View File

@ -2272,7 +2272,7 @@ wpi_cmd2(struct wpi_softc *sc, struct wpi_buf *buf)
}
if (error != 0) {
/* Too many DMA segments, linearize mbuf. */
m1 = m_collapse(buf->m, M_NOWAIT, WPI_MAX_SCATTER);
m1 = m_collapse(buf->m, M_NOWAIT, WPI_MAX_SCATTER - 1);
if (m1 == NULL) {
device_printf(sc->sc_dev,
"%s: could not defrag mbuf\n", __func__);
@ -2291,6 +2291,10 @@ wpi_cmd2(struct wpi_softc *sc, struct wpi_buf *buf)
}
}
KASSERT(nsegs < WPI_MAX_SCATTER,
("too many DMA segments, nsegs (%d) should be less than %d",
nsegs, WPI_MAX_SCATTER));
data->m = buf->m;
data->ni = buf->ni;