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

assert that the file server doesn't try to return more cookies than

Browse Source 
it was supposed to
This commit is contained in:
pooka 2007-04-20 08:28:53 +00:00
parent b0c22204d2
commit 5ad485727c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libpuffs/puffs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: puffs.c,v 1.38 2007/04/16 13:04:49 pooka Exp $ */
/* $NetBSD: puffs.c,v 1.39 2007/04/20 08:28:53 pooka Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
__RCSID("$NetBSD: puffs.c,v 1.38 2007/04/16 13:04:49 pooka Exp $");
__RCSID("$NetBSD: puffs.c,v 1.39 2007/04/20 08:28:53 pooka Exp $");
#endif /* !lint */
#include <sys/param.h>
@ -1026,7 +1026,7 @@ puffs_calldispatcher(struct puffs_cc *pcc)
struct puffs_vnreq_readdir *auxt = auxbuf;
struct dirent *dent;
off_t *cookies;
size_t res;
size_t res, origcookies;
if (pops->puffs_node_readdir == NULL) {
error = 0;
@ -1036,8 +1036,10 @@ puffs_calldispatcher(struct puffs_cc *pcc)
if (auxt->pvnr_ncookies) {
/* LINTED: pvnr_data is __aligned() */
cookies = (off_t *)auxt->pvnr_data;
origcookies = auxt->pvnr_ncookies;
} else {
cookies = NULL;
origcookies = 0;
}
/* LINTED: dentoff is aligned in the kernel */
dent = (struct dirent *)
@ -1049,6 +1051,9 @@ puffs_calldispatcher(struct puffs_cc *pcc)
&auxt->pvnr_resid, &auxt->pvnr_cred,
&auxt->pvnr_eofflag, cookies, &auxt->pvnr_ncookies);
/* much easier to track non-working NFS */
assert(auxt->pvnr_ncookies <= origcookies);
/* need to move a bit more */
preq->preq_buflen = sizeof(struct puffs_vnreq_readdir)
+ auxt->pvnr_dentoff + (res - auxt->pvnr_resid);