Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uirda(4): Unconditionally initializes mutexes and selq on attach. 

We're going to unconditionally destroy them on detach.

Reported-by: syzbot+6b8aea3a51d8b1e5ab61@syzkaller.appspotmail.com
https://syzkaller.appspot.com/bug?id=ec5ed628986cba5aab5705691596a2d27b0301fc
This commit is contained in:
riastradh 2022-08-07 11:25:32 +00:00
parent 5a58ccfbec
commit 3884380750
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/usb/uirda.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uirda.c,v 1.52 2021/09/26 15:08:29 thorpej Exp $ */
/* $NetBSD: uirda.c,v 1.53 2022/08/07 11:25:32 riastradh Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.52 2021/09/26 15:08:29 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.53 2022/08/07 11:25:32 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@ -201,6 +201,10 @@ uirda_attach(device_t parent, device_t self, void *aux)
sc->sc_udev = dev;
sc->sc_iface = iface;
mutex_init(&sc->sc_wr_buf_lk, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_rd_buf_lk, MUTEX_DEFAULT, IPL_NONE);
selinit(&sc->sc_rd_sel);
if (sc->sc_hdszi == 0)
sc->sc_hdszi = UIRDA_INPUT_HEADER_SIZE;
@ -280,10 +284,6 @@ uirda_attach(device_t parent, device_t self, void *aux)
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
mutex_init(&sc->sc_wr_buf_lk, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_rd_buf_lk, MUTEX_DEFAULT, IPL_NONE);
selinit(&sc->sc_rd_sel);
ia.ia_type = IR_TYPE_IRFRAME;
ia.ia_methods = sc->sc_irm ? sc->sc_irm : &uirda_methods;
ia.ia_handle = sc;