CacheFiles: Fix memory leak in cachefiles_check_auxdata error paths
David Howells
maintainerPATCH 1/2 CacheFiles: Fix memory leak in cachefiles_check_auxdata error paths
From: Josh Boyer <[email protected]>
In cachefiles_check_auxdata(), we allocate auxbuf but fail to free it if we determine there's an error or that the data is stale.
Further, assigning the output of vfs_getxattr() to auxbuf->len gives problems with checking for errors as auxbuf->len is a u16. We don't actually need to set auxbuf->len, so keep the length in a variable for now. We shouldn't need to check the upper limit of the buffer as an overflow there should be indicated by -ERANGE.
Whilst we're at it, fscache_check_aux() returns an enum value, not an int, so assign it to an appropriately typed variable rather than to ret.
---
fs/cachefiles/xattr.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
fs/cachefiles/xattr.c +15 -14
@@ -162,8 +162,9 @@ int cachefiles_update_object_xattr(struct cachefiles_object *object,int cachefiles_check_auxdata (struct cachefiles_object *object) {struct cachefiles_xattr *auxbuf; +enum fscache_checkaux validity;struct dentry *dentry = object->dentry; -unsigned int dlen; +ssize_t xlen;int ret;ASSERT (dentry);
@@ -174,22 +175,22 @@ int cachefiles_check_auxdata(struct cachefiles_object *object)if (!auxbuf)return -ENOMEM ; - auxbuf->len =vfs_getxattr (dentry, cachefiles_xattr_cache, - &auxbuf->type,512 +1 ); -if (auxbuf->len <1 ) -return -ESTALE ; - -if (auxbuf->type != object->fscache.cookie->def->type) -return -ESTALE ; + xlen =vfs_getxattr (dentry, cachefiles_xattr_cache, + &auxbuf->type,512 +1 ); + ret = -ESTALE ; +if (xlen <1 || + auxbuf->type != object->fscache.cookie->def->type) + goto error; - dlen = auxbuf->len -1 ; - ret =fscache_check_aux (&object->fscache, &auxbuf->data, dlen); + xlen--; + validity =fscache_check_aux (&object->fscache, &auxbuf->data, xlen); +if (validity !=FSCACHE_CHECKAUX_OKAY ) + goto error; + ret =0 ; +error:kfree (auxbuf); -if (ret !=FSCACHE_CHECKAUX_OKAY ) -return -ESTALE ; - -return 0 ; +return ret; }/*
David Howells
maintainerPATCH 2/2 CacheFiles: Don't try to dump the index key if the cookie has been cleared
Don't try to dump the index key that distinguishes an object if netfs data in the cookie the object refers to has been cleared (ie. the cookie has passed most of the way through __fscache_relinquish_cookie()).
Since the netfs holds the index key, we can't get at it once the ->def and ->netfs_data pointers have been cleared - and a NULL pointer exception will ensue, usually just after a:
CacheFiles: Error: Unexpected object collision
error is reported.
---
fs/cachefiles/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cachefiles/namei.c +1 -1
@@ -56,7 +56,7 @@ void __cachefiles_printk_object(struct cachefiles_object *object, object->fscache.cookie->parent, object->fscache.cookie->netfs_data, object->fscache.cookie->flags); -if (keybuf) +if (keybuf && cookie->def) keylen = cookie->def->get_key (cookie->netfs_data, keybuf,CACHEFILES_KEYBUF_SIZE );else