jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-20 16:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aix-largefile-update-20040316

Browse Source 
FIXES 3647

don't allow reading past the end of a file
This commit is contained in:
Hartmut Reuter 2004-03-17 02:29:39 +00:00 committed by Derrick Brashear
parent ec0ba71b30
commit 8022d7659e
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/afs/AIX/osi_vnodeops.c
View File

@ -1066,6 +1066,7 @@ afs_vm_rdwr(vp, uiop, rw, ioflag, credp)
afs_size_t finalOffset;
off_t toffset;
int mixed = 0;
afs_size_t add2resid = 0;
#endif /* AFS_64BIT_CLIENT */
register struct vcache *vcp = VTOAFS(vp);
struct dcache *tdc;
@ -1104,6 +1105,16 @@ afs_vm_rdwr(vp, uiop, rw, ioflag, credp)
#ifdef AFS_64BIT_CLIENT
if (xfrOffset + xfrSize > afs_vmMappingEnd) {
if (rw == UIO_READ) {
/* don't read past EOF */
if (xfrSize+xfrOffset > fileSize) {
add2resid = xfrSize + xfrOffset - fileSize;
xfrSize = fileSize - xfrOffset;
if (xfrSize <= 0) goto fail;
txfrSize = xfrSize;
afsio_trim(uiop, txfrSize);
}
}
if (xfrOffset < afs_vmMappingEnd) {
/* special case of a buffer crossing the VM mapping line */
struct uio tuio;
@ -1135,6 +1146,7 @@ afs_vm_rdwr(vp, uiop, rw, ioflag, credp)
} else {
ReleaseReadLock(&vcp->lock);
code = afs_direct_rdwr(vp, uiop, rw, ioflag, credp);
uiop->uio_resid += add2resid;
return code;
}
}
@ -1198,6 +1210,7 @@ afs_vm_rdwr(vp, uiop, rw, ioflag, credp)
if (mixed) {
uiop->afsio_offset = finalOffset;
}
uiop->uio_resid += add2resid;
#endif /* AFS_64BIT_CLIENT */
return code;
}