summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraaron <aaron@openbsd.org>2000-06-19 00:12:41 +0000
committeraaron <aaron@openbsd.org>2000-06-19 00:12:41 +0000
commit4258d3d0915047347d35f57541008f631b686a49 (patch)
tree8ca476c06957c79b3c7b14c74414982fdbad8d75
parent(CFLAGS): add _LKM so kernel header files behave nicely. (diff)
downloadwireguard-openbsd-4258d3d0915047347d35f57541008f631b686a49.tar.xz
wireguard-openbsd-4258d3d0915047347d35f57541008f631b686a49.zip
Insert missing splx(); me and roberto@ns2.freenix.org.
Hacking at USENIX 2000 :-)
-rw-r--r--sys/dev/ic/an.c6
-rw-r--r--sys/dev/pcmcia/if_wi.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 926d754e8f5..e391141f1d4 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: an.c,v 1.5 2000/06/18 18:42:08 tholo Exp $ */
+/* $OpenBSD: an.c,v 1.6 2000/06/19 00:12:41 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -891,8 +891,10 @@ int an_ioctl(ifp, command, data)
sc = ifp->if_softc;
ifr = (struct ifreq *)data;
- if (sc->an_gone)
+ if (sc->an_gone) {
+ splx(s);
return(ENODEV);
+ }
if ((error = ether_ioctl(ifp, &sc->arpcom, command, data)) > 0) {
splx(s);
diff --git a/sys/dev/pcmcia/if_wi.c b/sys/dev/pcmcia/if_wi.c
index 91c064be100..0c5dbf925ee 100644
--- a/sys/dev/pcmcia/if_wi.c
+++ b/sys/dev/pcmcia/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.12 2000/06/18 04:02:11 aaron Exp $ */
+/* $OpenBSD: if_wi.c,v 1.13 2000/06/19 00:12:41 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -135,7 +135,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.12 2000/06/18 04:02:11 aaron Exp $";
+ "$OpenBSD: if_wi.c,v 1.13 2000/06/19 00:12:41 aaron Exp $";
#endif /* lint */
#ifdef foo
@@ -1040,8 +1040,10 @@ STATIC int wi_ioctl(ifp, command, data)
sc = ifp->if_softc;
ifr = (struct ifreq *)data;
- if (sc->wi_gone)
+ if (sc->wi_gone) {
+ splx(s);
return(ENODEV);
+ }
DPRINTF (WID_IOCTL, ("wi_ioctl: command %lu data %p", command, data));