Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo the part of rev. 1.93 that turned the past-EOF check into an assertion.

Browse Source 
read() can't request pages past EOF, but mmap() can.  apparently I had
disengaged the brain when I said that was ok.
This commit is contained in:
chs 2005-02-16 15:25:33 +00:00
parent 63fca13660
commit d67b9b2ff2
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/miscfs/genfs/genfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfs_vnops.c,v 1.94 2005/01/25 23:55:21 wrstuden Exp $ */
/* $NetBSD: genfs_vnops.c,v 1.95 2005/02/16 15:25:33 chs Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.94 2005/01/25 23:55:21 wrstuden Exp $");
__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.95 2005/02/16 15:25:33 chs Exp $");
#if defined(_KERNEL_OPT)
#include "opt_nfsserver.h"
@ -520,7 +520,19 @@ genfs_getpages(void *v)
KASSERT(ap->a_centeridx >= 0 || ap->a_centeridx <= orignpages);
KASSERT((origoffset & (PAGE_SIZE - 1)) == 0 && origoffset >= 0);
KASSERT(orignpages > 0);
KASSERT(origoffset + (ap->a_centeridx << PAGE_SHIFT) < memeof);
/*
* Bounds-check the request.
*/
if (origoffset + (ap->a_centeridx << PAGE_SHIFT) >= memeof) {
if ((flags & PGO_LOCKED) == 0) {
simple_unlock(&uobj->vmobjlock);
}
UVMHIST_LOG(ubchist, "off 0x%x count %d goes past EOF 0x%x",
origoffset, *ap->a_count, memeof,0);
return (EINVAL);
}
/*
* For PGO_LOCKED requests, just return whatever's in memory.