Module Name: src Committed By: martin Date: Tue Apr 10 11:18:02 UTC 2018
Modified Files: src/sys/arch/amiga/amiga [netbsd-7-1]: cc.c Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.16.1 src/sys/arch/amiga/amiga/cc.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/arch/amiga/amiga/cc.c diff -u src/sys/arch/amiga/amiga/cc.c:1.26 src/sys/arch/amiga/amiga/cc.c:1.26.16.1 --- src/sys/arch/amiga/amiga/cc.c:1.26 Wed Jan 22 00:25:16 2014 +++ src/sys/arch/amiga/amiga/cc.c Tue Apr 10 11:18:02 2018 @@ -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 @@ alloc_chipmem(u_long size) if (size <= mn->size) break; - if (mn == NULL) + if (mn == NULL) { + splx(s); return NULL; + } if ((mn->size - size) <= sizeof (*mn)) { /*