diff options
| author | Anton Lindqvist <anton@cvs.openbsd.org> | 2021-11-25 06:25:33 +0000 |
|---|---|---|
| committer | Anton Lindqvist <anton@cvs.openbsd.org> | 2021-11-25 06:25:33 +0000 |
| commit | dd1741bb08cf6e3005e355a79690a6848c38349d (patch) | |
| tree | e93e379558ae4cdb8c3a3b396adbad60ac13c467 /sys/dev/usb/uhidev.c | |
| parent | 6b1e1eab7eb9be18a6c76c0f539e6cfb612adf71 (diff) | |
Assert that at least one report id is claimed during multiple report ids
attachment. Should prevent uhidev drivers from doing the wrong thing in their
corresponding match routine.
Diffstat (limited to 'sys/dev/usb/uhidev.c')
| -rw-r--r-- | sys/dev/usb/uhidev.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index 3526e4cb86e..2d741b85f2e 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.c,v 1.103 2021/11/22 11:30:16 anton Exp $ */ +/* $OpenBSD: uhidev.c,v 1.104 2021/11/25 06:25:32 anton Exp $ */ /* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -256,16 +256,21 @@ uhidev_attach(struct device *parent, struct device *self, void *aux) /* Look for a driver claiming multiple report IDs first. */ dev = config_found_sm(self, &uha, NULL, NULL); if (dev != NULL) { + int nclaimed = 0; + for (repid = 0; repid < nrepid; repid++) { + if (!uha.claimed[repid]) + continue; + + nclaimed++; /* * Could already be assigned by uhidev_set_report_dev(). */ if (sc->sc_subdevs[repid] != NULL) - continue; - - if (uha.claimed[repid]) sc->sc_subdevs[repid] = (struct uhidev *)dev; } + KASSERTMSG(nclaimed > 0, "%s did not claim any report ids", + dev->dv_xname); } free(uha.claimed, M_TEMP, nrepid); |