[src/netbsd-7-1]: src/sys/arch/amiga/amiga Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/9b31d64dc80a
branches:  netbsd-7-1
changeset: 800893:9b31d64dc80a
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Apr 10 11:18:02 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1597):
        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 121e0116f2aa -r 9b31d64dc80a sys/arch/amiga/amiga/cc.c
--- a/sys/arch/amiga/amiga/cc.c Mon Apr 09 13:30:08 2018 +0000
+++ b/sys/arch/amiga/amiga/cc.c Tue Apr 10 11:18:02 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.16.1 2018/04/10 11:18:02 martin 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.16.1 2018/04/10 11:18:02 martin 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)) {
                /*