4 files changed, 15 insertions, 2 deletions

diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 7bac404d5ed8..30a983edb219 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -765,7 +765,9 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
 			cur_scp->mouse_proc = NULL;
 			cur_scp->mouse_pid = 0;
 		} else {
+		    PROC_LOCK(cur_scp->mouse_proc);
 		    psignal(cur_scp->mouse_proc, cur_scp->mouse_signal);
+		    PROC_UNLOCK(cur_scp->mouse_proc);
 		    break;
 		}
 	    }
@@ -818,7 +820,9 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
 			cur_scp->mouse_proc = NULL;
 			cur_scp->mouse_pid = 0;
 		} else {
+		    PROC_LOCK(cur_scp->mouse_proc);
 		    psignal(cur_scp->mouse_proc, cur_scp->mouse_signal);
+		    PROC_UNLOCK(cur_scp->mouse_proc);
 		    break;
 		}
 	    }
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 452c8e0b9d68..631daa490c24 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -2300,7 +2300,9 @@ signal_vt_rel(scr_stat *scp)
     if (scp->smode.mode != VT_PROCESS)
 	return FALSE;
     scp->status |= SWITCH_WAIT_REL;
+    PROC_LOCK(scp->proc);
     psignal(scp->proc, scp->smode.relsig);
+    PROC_UNLOCK(scp->proc);
     DPRINTF(5, ("sending relsig to %d\n", scp->pid));
     return TRUE;
 }
@@ -2313,7 +2315,9 @@ signal_vt_acq(scr_stat *scp)
     if (scp->sc->unit == sc_console_unit)
 	cons_unavail = TRUE;
     scp->status |= SWITCH_WAIT_ACQ;
+    PROC_LOCK(scp->proc);
     psignal(scp->proc, scp->smode.acqsig);
+    PROC_UNLOCK(scp->proc);
     DPRINTF(5, ("sending acqsig to %d\n", scp->pid));
     return TRUE;
 }
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 1cdd455ff937..f413c3bc48b5 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -366,7 +366,9 @@ uhid_intr(xfer, addr, status)
 	selwakeup(&sc->sc_rsel);
 	if (sc->sc_async != NULL) {
 		DPRINTFN(3, ("uhid_intr: sending SIGIO %p\n", sc->sc_async));
+		PROC_LOCK(sc->sc_async);
 		psignal(sc->sc_async, SIGIO);
+		PROC_UNLOCK(sc->sc_async);
 	}
 }
 
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index f917d1f18504..5382ec0f2849 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -51,13 +51,13 @@
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/device.h>
 #include <sys/kthread.h>
-#include <sys/proc.h>
 #elif defined(__FreeBSD__)
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/filio.h>
 #include <sys/uio.h>
 #endif
+#include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/poll.h>
 #if __FreeBSD_version >= 500014
@@ -683,8 +683,11 @@ usbd_add_event(type, dev)
 	SIMPLEQ_INSERT_TAIL(&usb_events, ueq, next);
 	wakeup(&usb_events);
 	selwakeup(&usb_selevent);
-	if (usb_async_proc != NULL)
+	if (usb_async_proc != NULL) {
+		PROC_LOCK(usb_async_proc);
 		psignal(usb_async_proc, SIGIO);
+		PROC_UNLOCK(usb_async_proc);
+	}
 	splx(s);
 }