jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 15:30:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libafs: afs_CacheFetchProc can't be called without a dcache pointer

Browse Source 
An inspection of the only call site suggests that afs_CacheFetchProc()
can't be called with a null dcache pointer, and code further down
in this function dereferences adc unconditionally (assuming
rxfs_fetchInit() doesn't crash first) so remove the conditional
here.

Probably more of these parameters can and should be included in the
AFS_NONNULL.

Change-Id: Ic87517376085b0d5bc7631b5558411259ae986f4
Reviewed-on: http://gerrit.openafs.org/5180
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Garrett Wollman 2011-08-09 00:28:27 -04:00 committed by Derrick Brashear
parent 070e90a921
commit 77f258a71d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/afs/afs_fetchstore.c
View File

@ -1114,9 +1114,7 @@ afs_CacheFetchProc(struct afs_conn *tc, struct rx_connection *rxconn,
osi_GetuTime(&xferStartTime); osi_GetuTime(&xferStartTime);
#endif /* AFS_NOSTATS */ #endif /* AFS_NOSTATS */
if (adc) { adc->validPos = base;
adc->validPos = base;
}
if ( !code ) do { if ( !code ) do {
if (avc->f.states & CForeign) { if (avc->f.states & CForeign) {

3
src/afs/afs_prototypes.h
View File

@ -503,7 +503,8 @@ extern int afs_CacheFetchProc(struct afs_conn *tc, struct rx_connection *rxconn,
struct osi_file *fP, struct osi_file *fP,
afs_size_t abase, struct dcache *adc, afs_size_t abase, struct dcache *adc,
struct vcache *avc, afs_int32 size, struct vcache *avc, afs_int32 size,
struct afs_FetchOutput *tsmall); struct afs_FetchOutput *tsmall)
AFS_NONNULL((5));
/* afs_memcache.c */ /* afs_memcache.c */
extern int afs_InitMemCache(int blkCount, int blkSize, int flags); extern int afs_InitMemCache(int blkCount, int blkSize, int flags);