[src/netbsd-8]: src/sys/arch/amiga/amiga Pull up following revision(s) (reque...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb869464cb3c
branches:  netbsd-8
changeset: 434849:eb869464cb3c
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Apr 09 13:27:42 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #721):
        sys/arch/amiga/amiga/cc.c: revision 1.27
spl leak, found by mootja

diffstat:

 sys/arch/amiga/amiga/cc.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 010729c01112 -r eb869464cb3c sys/arch/amiga/amiga/cc.c
--- a/sys/arch/amiga/amiga/cc.c Mon Apr 09 13:25:36 2018 +0000
+++ b/sys/arch/amiga/amiga/cc.c Mon Apr 09 13:27:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $ */
+/*     $NetBSD: cc.c,v 1.26.22.1 2018/04/09 13:27:42 bouyer Exp $      */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26.22.1 2018/04/09 13:27:42 bouyer Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -503,8 +503,10 @@
                if (size <= mn->size)
                        break;
 
-       if (mn == NULL)
+       if (mn == NULL) {
+               splx(s);
                return NULL;
+       }
 
        if ((mn->size - size) <= sizeof (*mn)) {
                /*