Module Name: src Committed By: martin Date: Tue Apr 10 11:28:56 UTC 2018
Modified Files: src/sys/arch/amiga/amiga [netbsd-6-1]: cc.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1544): sys/arch/amiga/amiga/cc.c: revision 1.27 (patch) spl leak, found by mootja To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.28.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.22 src/sys/arch/amiga/amiga/cc.c:1.22.28.1 --- src/sys/arch/amiga/amiga/cc.c:1.22 Mon Dec 20 00:25:25 2010 +++ src/sys/arch/amiga/amiga/cc.c Tue Apr 10 11:28:56 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cc.c,v 1.22 2010/12/20 00:25:25 matt Exp $ */ +/* $NetBSD: cc.c,v 1.22.28.1 2018/04/10 11:28:56 martin Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.22 2010/12/20 00:25:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.22.28.1 2018/04/10 11:28:56 martin Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -504,9 +504,10 @@ alloc_chipmem(u_long size) while (size > mn->size && mn != (void *)&free_list) mn = mn->free_link.cqe_next; - if (mn == (void *)&free_list) + if (mn == (void *)&free_list) { + splx(s); return(NULL); - + } if ((mn->size - size) <= sizeof (*mn)) { /* * our allocation would not leave room