Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ac512aa authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

CacheFiles: Fix error handling in cachefiles_determine_cache_security() 



cachefiles_determine_cache_security() is expected to return with a
security override in place.  However, if set_create_files_as() fails, we
fail to do this.  In this case, we should just reinstate the security
override that was set by the caller.

Furthermore, if set_create_files_as() fails, we should dispose of the
new credentials we were in the process of creating.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 91af7081

fs/cachefiles/security.c

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ static int cachefiles_check_cache_dir(struct cachefiles_cache *cache, 
/*

 * check the security details of the on-disk cache

 * - must be called with security override in force

 * - must return with a security override in force - even in the case of an

 *   error

 */

int cachefiles_determine_cache_security(struct cachefiles_cache *cache,

					struct dentry *root,
@@ -99,6 +101,8 @@ int cachefiles_determine_cache_security(struct cachefiles_cache *cache, 
	 * which create files */

	ret = set_create_files_as(new, root->d_inode);

	if (ret < 0) {

		abort_creds(new);

		cachefiles_begin_secure(cache, _saved_cred);

		_leave(" = %d [cfa]", ret);

		return ret;

	}