Module Name: src
Committed By: riastradh
Date: Sun Aug 7 11:25:33 UTC 2022
Modified Files:
src/sys/dev/usb: uirda.c
Log Message:
uirda(4): Unconditionally initializes mutexes and selq on attach.
We're going to unconditionally destroy them on detach.
Reported-by: syzbot+6b8aea3a51d8b1e5a...@syzkaller.appspotmail.com
https://syzkaller.appspot.com/bug?id=ec5ed628986cba5aab5705691596a2d27b0301fc
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/uirda.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.52 src/sys/dev/usb/uirda.c:1.53
--- src/sys/dev/usb/uirda.c:1.52 Sun Sep 26 15:08:29 2021
+++ src/sys/dev/usb/uirda.c Sun Aug 7 11:25:32 2022
@@ -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 s
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 s
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;
