diff options
| author |   ratchov <ratchov@openbsd.org> | 2021-02-02 11:18:57 +0000 |
|---|---|---|
| committer | ratchov <ratchov@openbsd.org> | 2021-02-02 11:18:57 +0000 |
| commit | ce71fe154a8115405e11f057838e87d07748a7d8 (patch) | |
| tree | 2bf37725222b7401f163de036d65f26c95ed5ab5 | |
| parent | article fix; from eddie youseph (diff) | |
| download | wireguard-openbsd-ce71fe154a8115405e11f057838e87d07748a7d8.tar.xz wireguard-openbsd-ce71fe154a8115405e11f057838e87d07748a7d8.zip | |
Fix use-after-free in dev_abort()
Fixes crash that can occur when an usb device is unplugged, found by edd@
| -rw-r--r-- | usr.bin/sndiod/dev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/sndiod/dev.c b/usr.bin/sndiod/dev.c index 176e8b17e79..6e2e1a6fa6e 100644 --- a/usr.bin/sndiod/dev.c +++ b/usr.bin/sndiod/dev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev.c,v 1.89 2021/01/29 11:38:23 ratchov Exp $ */ +/* $OpenBSD: dev.c,v 1.90 2021/02/02 11:18:57 ratchov Exp $ */ /* * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org> * @@ -1281,12 +1281,12 @@ dev_abort(struct dev *d) d->slot_list = NULL; for (c = ctlslot_array, i = DEV_NCTLSLOT; i > 0; i--, c++) { + if (c->ops == NULL) + continue; if (c->opt->dev != d) continue; - if (c->ops) { - c->ops->exit(c->arg); - c->ops = NULL; - } + c->ops->exit(c->arg); + c->ops = NULL; } midi_abort(d->midi); |