Source-Changes-HG archive
[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index][
Old Index]
src: Pull up following revision(s) (requested by msaitoh in tick...
details: https://anonhg.NetBSD.org/src/rev/5d761660fb04
branches: netbsd-7-0
changeset: 317964:5d761660fb04
user: martin <martin%NetBSD.org@localhost>
date: Mon Apr 09 13:31:26 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 9ec10a4da032 -r 5d761660fb04 sys/arch/amiga/amiga/cc.c
--- a/sys/arch/amiga/amiga/cc.c Mon Apr 09 13:24:42 2018 +0000
+++ b/sys/arch/amiga/amiga/cc.c Mon Apr 09 13:31:26 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.8.1 2018年04月09日 13:31:26 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.8.1 2018年04月09日 13:31:26 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)) {
/*
Home |
Main Index |
Thread Index |
Old Index