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

afs: Handle reading past the end of a file

Browse Source 
... except that this change doesn't actually handle this, it just
stops clang from throwing an error about the bogus code that's already
in there. This needs fixed properly ...

Change-Id: Ifbf190a86037fced8104ed0843dd1e7aa0b999a7
Reviewed-on: http://gerrit.openafs.org/7090
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Simon Wilkinson 2012-03-30 19:41:17 +01:00 committed by Derrick Brashear
parent f1842bcb87
commit 3198cef8cc
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/afs/VNOPS/afs_vnop_read.c
View File

@ -48,7 +48,8 @@ afs_read(struct vcache *avc, struct uio *auio, afs_ucred_t *acred,
afs_size_t totalLength; afs_size_t totalLength;
afs_size_t transferLength; afs_size_t transferLength;
afs_size_t filePos; afs_size_t filePos;
afs_size_t offset, len, tlen; afs_size_t offset, tlen;
afs_size_t len = 0;
afs_int32 trimlen; afs_int32 trimlen;
struct dcache *tdc = 0; struct dcache *tdc = 0;
afs_int32 error, trybusy = 1; afs_int32 error, trybusy = 1;
@ -108,6 +109,16 @@ afs_read(struct vcache *avc, struct uio *auio, afs_ucred_t *acred,
* Locks held: * Locks held:
* avc->lock(R) * avc->lock(R)
*/ */
/* This bit is bogus. We're checking to see if the read goes past the
* end of the file. If so, we should be zeroing out all of the buffers
* that the client has passed into us (there is a danger that we may leak
* kernel memory if we do not). However, this behaviour is disabled by
* not setting len before this segment runs, and by setting len to 0
* immediately we enter it. In addition, we also need to check for a read
* which partially goes off the end of the file in the while loop below.
*/
if (filePos >= avc->f.m.Length) { if (filePos >= avc->f.m.Length) {
if (len > AFS_ZEROS) if (len > AFS_ZEROS)
len = sizeof(afs_zeros); /* and in 0 buffer */ len = sizeof(afs_zeros); /* and in 0 buffer */