xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cwfs: fix read offset integer overflow

Browse source
This commit is contained in:
cinap_lenrek 2012-08-01 01:10:24 +02:00
parent c2304e9329
commit 235f71ba47
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sys/src/cmd/cwfs/9p1.c
View file

@ -911,8 +911,9 @@ f_read(Chan *cp, Fcall *in, Fcall *ou)
} }
goto out; goto out;
} }
if(offset >= d->size)
if(offset+count > d->size) count = 0;
else if(offset+count > d->size)
count = d->size - offset; count = d->size - offset;
while(count > 0) { while(count > 0) {
if(p == 0) { if(p == 0) {

4
sys/src/cmd/cwfs/9p2.c
View file

@ -1017,7 +1017,9 @@ fs_read(Chan* chan, Fcall* f, Fcall* r, uchar* data)
accessdir(p, d, FREAD, file->uid); accessdir(p, d, FREAD, file->uid);
if(d->mode & DDIR) if(d->mode & DDIR)
goto dread; goto dread;
if(offset+count > d->size) if(offset >= d->size)
count = 0;
else if(offset+count > d->size)
count = d->size - offset; count = d->size - offset;
while(count > 0){ while(count > 0){
if(p == nil){ if(p == nil){