o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libdiskfs: fix ext2 directory reading bug (Mike Mammarella)

Browse source
This commit is contained in:
Russ Cox 2008-01-12 11:04:41 -05:00
parent 1a4b58ebd8
commit 52abe8e130
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libdiskfs/ext2.c
View file

@ -568,7 +568,7 @@ ext2readdir(Fsys *fsys, SunAuthUnix *au, Nfs3Handle *h, u32int count, u64int coo
{ {
u32int nblock; u32int nblock;
u32int i; u32int i;
int off, done; int off, outofspace;
uchar *data, *dp, *dep, *p, *ep, *ndp; uchar *data, *dp, *dep, *p, *ep, *ndp;
Dirent de; Dirent de;
Inode ino; Inode ino;
@ -588,6 +588,9 @@ ext2readdir(Fsys *fsys, SunAuthUnix *au, Nfs3Handle *h, u32int count, u64int coo
if((ok = inoperm(&ino, au, AREAD)) != Nfs3Ok) if((ok = inoperm(&ino, au, AREAD)) != Nfs3Ok)
return ok; return ok;
if(debug) print("readdir cookie %#llux ino.size %#llux\n",
(u64int)cookie, (u64int)ino.size);
if(cookie >= ino.size){ if(cookie >= ino.size){
*peof = 1; *peof = 1;
*pcount = 0; *pcount = 0;
@ -604,8 +607,8 @@ ext2readdir(Fsys *fsys, SunAuthUnix *au, Nfs3Handle *h, u32int count, u64int coo
nblock = (ino.size+fs->blocksize-1) / fs->blocksize; nblock = (ino.size+fs->blocksize-1) / fs->blocksize;
i = cookie/fs->blocksize; i = cookie/fs->blocksize;
off = cookie%fs->blocksize; off = cookie%fs->blocksize;
done = 0; outofspace = 0;
for(; i<nblock && !done; i++){ for(; i<nblock && !outofspace; i++, off=0){
if(i==nblock-1) if(i==nblock-1)
want = ino.size % fs->blocksize; want = ino.size % fs->blocksize;
else else
@ -642,16 +645,16 @@ ext2readdir(Fsys *fsys, SunAuthUnix *au, Nfs3Handle *h, u32int count, u64int coo
e.name = de.name; e.name = de.name;
e.namelen = de.namlen; e.namelen = de.namlen;
e.cookie = (u64int)i*fs->blocksize + (p - b->data); e.cookie = (u64int)i*fs->blocksize + (p - b->data);
if(debug) print("%.*s %#llux\n", utfnlen(e.name, e.namelen), e.name, (u64int)e.cookie);
if(nfs3entrypack(dp, dep, &ndp, &e) < 0){ if(nfs3entrypack(dp, dep, &ndp, &e) < 0){
done = 1; outofspace = 1;
break; break;
} }
dp = ndp; dp = ndp;
} }
off = 0;
blockput(b); blockput(b);
} }
if(i==nblock) if(i==nblock && !outofspace)
*peof = 1; *peof = 1;
*pcount = dp - data; *pcount = dp - data;