diff options
| author | Gordon Tetlow <gordon@FreeBSD.org> | 2020-08-05 17:11:18 +0000 |
|---|---|---|
| committer | Gordon Tetlow <gordon@FreeBSD.org> | 2020-08-05 17:11:18 +0000 |
| commit | c8f3b2a43efa294d3c0fc85345c637814f4aeb72 (patch) | |
| tree | ea20f40bfa1d6adc0788a795f48d6b75ebb8d8a1 | |
| parent | 2c1bbcd8ea2989475a3c34fd48f0d0faff8e4efb (diff) | |
| download | src-test2-c8f3b2a43efa294d3c0fc85345c637814f4aeb72.tar.gz src-test2-c8f3b2a43efa294d3c0fc85345c637814f4aeb72.zip | |
Notes
| -rw-r--r-- | sys/dev/usb/net/if_smsc.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 1b4c2e353740..07896877c1c1 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -970,7 +970,7 @@ smsc_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) struct mbuf *m; struct usb_page_cache *pc; uint32_t rxhdr; - uint16_t pktlen; + int pktlen; int off; int actlen; @@ -996,6 +996,9 @@ smsc_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) /* The frame header is always aligned on a 4 byte boundary */ off = ((off + 0x3) & ~0x3); + if ((off + sizeof(rxhdr)) > actlen) + goto tr_setup; + usbd_copy_out(pc, off, &rxhdr, sizeof(rxhdr)); off += (sizeof(rxhdr) + ETHER_ALIGN); rxhdr = le32toh(rxhdr); @@ -1024,7 +1027,13 @@ smsc_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); goto tr_setup; } - + if (pktlen > m->m_len) { + smsc_dbg_printf(sc, "buffer too small %d vs %d bytes", + pktlen, m->m_len); + if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); + m_freem(m); + goto tr_setup; + } usbd_copy_out(pc, off, mtod(m, uint8_t *), pktlen); /* Check if RX TCP/UDP checksumming is being offloaded */ |