From 04258de351c67af30aab679cc904fe856751cdde Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Thu, 19 Nov 1998 06:20:42 +0000 Subject: Fixed a null pointer panic in spc_free(). swap_pager_putpages() almost always causes this panic for the curproc != pageproc case. This case apparently doesn't happen in normal operation, but it happens when vm_page_alloc_contig() is called when there is a memory hogging application that hasn't already been paged out. PR: 8632 Reviewed by: info@opensound.com (Dev Mazumdar), dg Broken in: rev.1.89 (1998/02/23) --- sys/vm/swap_pager.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'sys') diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index bd470dc8a2a9..62733c9b1d84 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 - * $Id: swap_pager.c,v 1.102 1998/10/13 08:24:42 dg Exp $ + * $Id: swap_pager.c,v 1.103 1998/10/31 15:31:28 peter Exp $ */ /* @@ -1535,12 +1535,14 @@ swap_pager_putpages(object, m, count, sync, rtvals) } } - if (bp->b_rcred != NOCRED) - crfree(bp->b_rcred); - if (bp->b_wcred != NOCRED) - crfree(bp->b_wcred); - - spc_free(spc); + if (spc != NULL) { + if (bp->b_rcred != NOCRED) + crfree(bp->b_rcred); + if (bp->b_wcred != NOCRED) + crfree(bp->b_wcred); + spc_free(spc); + } else + relpbuf(bp); if (swap_pager_free_pending) swap_pager_sync(); -- cgit v1.3