details: https://anonhg.NetBSD.org/src/rev/07ca726abccd
branches: netbsd-8
changeset: 434485:07ca726abccd
user: snj <snj%NetBSD.org@localhost>
date: Sun Dec 10 09:50:59 2017 +0000
description:
Pull up following revision(s) (requested by msaitoh in ticket #426):
sys/dev/pcmcia/if_malo_pcmcia.c: revision 1.14
two spl leaks, found by Mootja
diffstat:
sys/dev/pcmcia/if_malo_pcmcia.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (34 lines):
diff -r 365535db64fa -r 07ca726abccd sys/dev/pcmcia/if_malo_pcmcia.c
--- a/sys/dev/pcmcia/if_malo_pcmcia.c Sun Dec 10 09:48:04 2017 +0000
+++ b/sys/dev/pcmcia/if_malo_pcmcia.c Sun Dec 10 09:50:59 2017 +0000
@@ -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.13.6.1 2017/12/10 09:50:59 snj 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.13.6.1 2017/12/10 09:50:59 snj Exp $");
#ifdef _MODULE
#include <sys/module.h>
@@ -242,6 +242,7 @@
if_deactivate(ifp);
break;
default:
+ splx(s);
return EOPNOTSUPP;
}
splx(s);
@@ -1983,6 +1984,7 @@
if (psize > MALO_CMD_BUFFER_SIZE) {
aprint_error_dev(sc->sc_dev,
"command response too large: %dbyte\n", psize);
+ splx(s);
return EIO;
}