diff options
| author | stas <stas@FreeBSD.org> | 2011-09-02 20:35:22 +0000 |
|---|---|---|
| committer | stas <stas@FreeBSD.org> | 2011-09-02 20:35:22 +0000 |
| commit | 7c8760d4c566dc37ce75b7bf1ba7b298396de28c (patch) | |
| tree | 381fadb631d103e5091f21013325ebfba889d95b /sys/dev/smc/if_smc.c | |
| parent | 8f442730d25f0bdc628bfb9865871da47a7bf5dc (diff) | |
| download | FreeBSD-src-7c8760d4c566dc37ce75b7bf1ba7b298396de28c.zip FreeBSD-src-7c8760d4c566dc37ce75b7bf1ba7b298396de28c.tar.gz | |
- Fix NULL pointer dereference when a packet of uneven size is being
transmitted.
Approved by: re (kib)
MFC after: 3 days
Diffstat (limited to 'sys/dev/smc/if_smc.c')
| -rw-r--r-- | sys/dev/smc/if_smc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c index 22f8bab..4aa0396 100644 --- a/sys/dev/smc/if_smc.c +++ b/sys/dev/smc/if_smc.c @@ -538,6 +538,7 @@ smc_task_tx(void *context, int pending) struct smc_softc *sc; struct mbuf *m, *m0; u_int packet, len; + int last_len; uint8_t *data; (void)pending; @@ -590,16 +591,18 @@ smc_task_tx(void *context, int pending) * Push the data out to the device. */ data = NULL; + last_len = 0; for (; m != NULL; m = m->m_next) { data = mtod(m, uint8_t *); smc_write_multi_2(sc, DATA0, (uint16_t *)data, m->m_len / 2); + last_len = m->m_len; } /* * Push out the control byte and and the odd byte if needed. */ if ((len & 1) != 0 && data != NULL) - smc_write_2(sc, DATA0, (CTRL_ODD << 8) | data[m->m_len - 1]); + smc_write_2(sc, DATA0, (CTRL_ODD << 8) | data[last_len - 1]); else smc_write_2(sc, DATA0, 0); |
