jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid leaking stat info

Browse Source 
if a file is already CStatd we just copy out the information without doing
access checks. add an access check.

Change-Id: I94d1dc118189b19759d8e9635988c40f38026cbb
Reviewed-on: http://gerrit.openafs.org/995
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Derrick Brashear 2009-12-17 15:33:42 -05:00 committed by Derrick Brashear
parent 6c9d49d096
commit 6ec1846164
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/afs/LINUX/osi_vnodeops.c
View File

@ -786,7 +786,8 @@ afs_linux_revalidate(struct dentry *dp)
*/
if (vcp->f.states & CStatd &&
(!afs_fakestat_enable || vcp->mvstat != 1) &&
!afs_nfsexporter) {
!afs_nfsexporter &&
(vType(vcp) == VDIR || vType(vcp) == VLNK)) {
code = afs_CopyOutAttrs(vcp, &vattr);
} else {
credp = crref();

3
src/afs/LINUX24/osi_vnodeops.c
View File

@ -873,7 +873,8 @@ afs_linux_revalidate(struct dentry *dp)
*/
if (vcp->f.states & CStatd &&
(!afs_fakestat_enable || vcp->mvstat != 1) &&
!afs_nfsexporter) {
!afs_nfsexporter &&
(vType(vcp) == VDIR || vType(vcp) == VLNK)) {
code = afs_CopyOutAttrs(vcp, &vattr);
} else {
credp = crref();

45
src/afs/VNOPS/afs_vnop_attrs.c
View File

@ -189,7 +189,6 @@ afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, afs_ucred_t *acred)
afs_int32 code;
struct vrequest treq;
struct unixuser *au;
int inited = 0;
OSI_VC_CONVERT(avc);
AFS_STATCNT(afs_getattr);
@ -213,15 +212,23 @@ afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, afs_ucred_t *acred)
afs_PutFakeStat(&fakestat);
return code;
}
#if defined(AFS_SUN5_ENV) || defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN80_ENV)
#if defined(AFS_SUN5_ENV)
if (flags & ATTR_HINT) {
code = afs_CopyOutAttrs(avc, attrs);
return code;
}
if (flags & ATTR_HINT)
#else
if (avc->f.states & CUBCinit)
#endif
#if defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN80_ENV)
if (avc->f.states & CUBCinit) {
code = afs_CopyOutAttrs(avc, attrs);
{
if (!(code = afs_InitReq(&treq, acred))) {
if (vType(avc) != VDIR && vType(avc) != VLNK
!afs_AccessOK(avc, PRSFS_READ, &treq, DONT_CHECK_MODE_BITS)) {
code = EACCES;
}
if (!code)
code = afs_CopyOutAttrs(avc, attrs);
}
return code;
}
#endif
@ -235,13 +242,11 @@ afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, afs_ucred_t *acred)
if (afs_shuttingdown)
return EIO;
if (!(avc->f.states & CStatd)) {
if (!(code = afs_InitReq(&treq, acred))) {
code = afs_VerifyVCache2(avc, &treq);
inited = 1;
}
} else
code = 0;
code = afs_InitReq(&treq, acred);
if (code == 0 && !(avc->f.states & CStatd)) {
code = afs_VerifyVCache2(avc, &treq);
}
#ifdef AFS_BOZONLOCK_ENV
if (code == 0)
@ -249,17 +254,17 @@ afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, afs_ucred_t *acred)
afs_BozonUnlock(&avc->pvnLock, avc);
#endif
if (code == 0 && vType(avc) != VDIR && vType(avc) != VLNK &&
!afs_AccessOK(avc, PRSFS_READ, &treq, DONT_CHECK_MODE_BITS)) {
code = EACCES;
}
if (code == 0) {
osi_FlushText(avc); /* only needed to flush text if text locked last time */
code = afs_CopyOutAttrs(avc, attrs);
if (afs_nfsexporter) {
if (!inited) {
if ((code = afs_InitReq(&treq, acred)))
return code;
inited = 1;
}
if (AFS_NFSXLATORREQ(acred)) {
if ((vType(avc) != VDIR)
&& !afs_AccessOK(avc, PRSFS_READ, &treq,