Module Name: src Committed By: rin Date: Fri Aug 31 11:21:00 UTC 2018
Modified Files: src/sys/dev/usb: if_mue.c Log Message: Convert debug printf to KASSERTMSG for check of RX buffer length. Also turn KASSERT into KASSERTMSG for that of TX buffer. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/if_mue.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/if_mue.c diff -u src/sys/dev/usb/if_mue.c:1.4 src/sys/dev/usb/if_mue.c:1.5 --- src/sys/dev/usb/if_mue.c:1.4 Thu Aug 30 09:59:12 2018 +++ src/sys/dev/usb/if_mue.c Fri Aug 31 11:21:00 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mue.c,v 1.4 2018/08/30 09:59:12 rin Exp $ */ +/* $NetBSD: if_mue.c,v 1.5 2018/08/31 11:21:00 rin Exp $ */ /* $OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $ */ /* @@ -20,7 +20,7 @@ /* Driver for Microchip LAN7500/LAN7800 chipsets. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.4 2018/08/30 09:59:12 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.5 2018/08/31 11:21:00 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1229,7 +1229,8 @@ mue_encap(struct mue_softc *sc, struct m memcpy(c->mue_buf, &hdr, sizeof(hdr)); len = sizeof(hdr); - KASSERT(len + m->m_pkthdr.len <= sc->mue_txbufsz); + KASSERTMSG(len + m->m_pkthdr.len <= sc->mue_txbufsz, "%d <= %u", + len + m->m_pkthdr.len, sc->mue_txbufsz); m_copydata(m, 0, m->m_pkthdr.len, c->mue_buf + len); len += m->m_pkthdr.len; @@ -1447,10 +1448,8 @@ mue_rxeof(struct usbd_xfer *xfer, void * usbd_get_xfer_status(xfer, NULL, NULL, &total_len, NULL); - if (__predict_false(total_len > sc->mue_rxbufsz)) { - DPRINTF(sc, "too large transfer\n"); - goto done; - } + KASSERTMSG(total_len <= sc->mue_rxbufsz, "%d <= %u", + total_len, sc->mue_rxbufsz); do { if (__predict_false(total_len < sizeof(*hdrp))) {