diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-11 03:08:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-11 03:08:39 +0000 |
| commit | ff66b29a6614d58d5457b9dc86c6c23fbd33b988 (patch) | |
| tree | b3eee2652f7b83dac8cb8478e0379e7aca48c165 /sys/dev | |
| parent | e8291be0618bd1a14eef9faabac0c6b10ab74ab5 (diff) | |
use mallocarray(), then set the size afterwards. Prefer if people learn
and use this idiom everywhere, it is always safest.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/upd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/usb/upd.c b/sys/dev/usb/upd.c index e63cc462117..9b9fa7ad141 100644 --- a/sys/dev/usb/upd.c +++ b/sys/dev/usb/upd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: upd.c,v 1.12 2014/12/11 18:50:32 mpi Exp $ */ +/* $OpenBSD: upd.c,v 1.13 2015/01/11 03:08:38 deraadt Exp $ */ /* * Copyright (c) 2014 Andre de Oliveira <andre@openbsd.org> @@ -171,10 +171,11 @@ upd_attach(struct device *parent, struct device *self, void *aux) DPRINTF(("\nupd: devname=%s sc_max_repid=%d\n", sc->sc_hdev.sc_dev.dv_xname, sc->sc_max_repid)); - sc->sc_reports = malloc(sc->sc_max_repid * sizeof(struct upd_report), - M_USBDEV, M_WAITOK | M_ZERO); + sc->sc_reports = mallocarray(sc->sc_max_repid, + sizeof(struct upd_report), M_USBDEV, M_WAITOK | M_ZERO); + sc->sc_sensors = mallocarray(sc->sc_max_sensors, + sizeof(struct upd_sensor), M_USBDEV, M_WAITOK | M_ZERO); size = sc->sc_max_sensors * sizeof(struct upd_sensor); - sc->sc_sensors = malloc(size, M_USBDEV, M_WAITOK | M_ZERO); sc->sc_num_sensors = 0; uhidev_get_report_desc(uha->parent, &desc, &size); for (hdata = hid_start_parse(desc, size, hid_feature); |