Module Name: src
Committed By: maxv
Date: Sun Jun 25 12:25:02 UTC 2017
Modified Files:
src/sys/dev/pcmcia: if_malo_pcmcia.c
Log Message:
two spl leaks, found by Mootja
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pcmcia/if_malo_pcmcia.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/pcmcia/if_malo_pcmcia.c
diff -u src/sys/dev/pcmcia/if_malo_pcmcia.c:1.13 src/sys/dev/pcmcia/if_malo_pcmcia.c:1.14
--- src/sys/dev/pcmcia/if_malo_pcmcia.c:1.13 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/pcmcia/if_malo_pcmcia.c Sun Jun 25 12:25:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_malo_pcmcia.c,v 1.13 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: if_malo_pcmcia.c,v 1.14 2017/06/25 12:25:02 maxv Exp $ */
/* $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.13 2017/02/02 10:05:35 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.14 2017/06/25 12:25:02 maxv Exp $");
#ifdef _MODULE
#include <sys/module.h>
@@ -242,6 +242,7 @@ malo_pcmcia_activate(device_t dev, devac
if_deactivate(ifp);
break;
default:
+ splx(s);
return EOPNOTSUPP;
}
splx(s);
@@ -1983,6 +1984,7 @@ cmalo_cmd_response(struct malo_softc *sc
if (psize > MALO_CMD_BUFFER_SIZE) {
aprint_error_dev(sc->sc_dev,
"command response too large: %dbyte\n", psize);
+ splx(s);
return EIO;
}
