diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-26 15:31:16 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-26 15:31:16 +0000 |
| commit | 0960796318a49681f95e509960991339c8e9ccbe (patch) | |
| tree | 901b97163c8b0a266ffe9f5e62376af6356551be /sys/dev/usb/if_atu.c | |
| parent | aeee42adf59ba123e92b0d27d239de085540f864 (diff) | |
Add sizes to various free(9) calls. Fixing the simpler ones first.
ok natano visa
Diffstat (limited to 'sys/dev/usb/if_atu.c')
| -rw-r--r-- | sys/dev/usb/if_atu.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index 725a6dbb66b..44f3723b5d9 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.121 2017/01/22 10:17:39 dlg Exp $ */ +/* $OpenBSD: if_atu.c,v 1.122 2017/03/26 15:31:15 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -857,7 +857,7 @@ atu_internal_firmware(struct device *self) struct atu_softc *sc = (struct atu_softc *)self; u_char state, *ptr = NULL, *firm = NULL, status[6]; int block_size, block = 0, err, i; - size_t bytes_left = 0; + size_t firm_len, bytes_left = 0; char *name = "unknown-device"; /* @@ -886,7 +886,7 @@ atu_internal_firmware(struct device *self) DPRINTF(("%s: loading firmware %s...\n", sc->atu_dev.dv_xname, name)); - err = loadfirmware(name, &firm, &bytes_left); + err = loadfirmware(name, &firm, &firm_len); if (err != 0) { printf("%s: %s loadfirmware error %d\n", sc->atu_dev.dv_xname, name, err); @@ -894,6 +894,7 @@ atu_internal_firmware(struct device *self) } ptr = firm; + bytes_left = firm_len; state = atu_get_dfu_state(sc); while (block >= 0 && state > 0) { @@ -905,7 +906,7 @@ atu_internal_firmware(struct device *self) if (err) { DPRINTF(("%s: dfu_getstatus failed!\n", sc->atu_dev.dv_xname)); - free(firm, M_DEVBUF, 0); + free(firm, M_DEVBUF, firm_len); goto fail; } /* success means state => DnLoadIdle */ @@ -927,7 +928,7 @@ atu_internal_firmware(struct device *self) if (err) { DPRINTF(("%s: dfu_dnload failed\n", sc->atu_dev.dv_xname)); - free(firm, M_DEVBUF, 0); + free(firm, M_DEVBUF, firm_len); goto fail; } @@ -946,7 +947,7 @@ atu_internal_firmware(struct device *self) state = atu_get_dfu_state(sc); } - free(firm, M_DEVBUF, 0); + free(firm, M_DEVBUF, firm_len); if (state != DFUState_ManifestSync) { DPRINTF(("%s: state != manifestsync... eek!\n", @@ -988,7 +989,7 @@ atu_external_firmware(struct device *self) struct atu_softc *sc = (struct atu_softc *)self; u_char *ptr = NULL, *firm = NULL; int block_size, block = 0, err, i; - size_t bytes_left = 0; + size_t firm_len, bytes_left = 0; char *name = "unknown-device"; for (i = 0; i < nitems(atu_radfirm); i++) @@ -997,13 +998,14 @@ atu_external_firmware(struct device *self) DPRINTF(("%s: loading external firmware %s\n", sc->atu_dev.dv_xname, name)); - err = loadfirmware(name, &firm, &bytes_left); + err = loadfirmware(name, &firm, &firm_len); if (err != 0) { printf("%s: %s loadfirmware error %d\n", sc->atu_dev.dv_xname, name, err); return; } ptr = firm; + bytes_left = firm_len; while (bytes_left) { if (bytes_left > 1024) @@ -1018,7 +1020,7 @@ atu_external_firmware(struct device *self) if (err) { DPRINTF(("%s: could not load external firmware " "block\n", sc->atu_dev.dv_xname)); - free(firm, M_DEVBUF, 0); + free(firm, M_DEVBUF, firm_len); return; } @@ -1026,7 +1028,7 @@ atu_external_firmware(struct device *self) block++; bytes_left -= block_size; } - free(firm, M_DEVBUF, 0); + free(firm, M_DEVBUF, firm_len); err = atu_usb_request(sc, UT_WRITE_VENDOR_DEVICE, 0x0e, 0x0802, block, 0, NULL); |