diff --git a/[refs] b/[refs]
index 6ae2f54e1bf0..048339ec9a90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91af70814105f4c05e6e11b51c3269907b71794b
+refs/heads/master: 7ac512aa8237c43331ffaf77a4fd8b8d684819ba
diff --git a/trunk/fs/cachefiles/security.c b/trunk/fs/cachefiles/security.c
index b5808cdb2232..039b5011d83b 100644
--- a/trunk/fs/cachefiles/security.c
+++ b/trunk/fs/cachefiles/security.c
@@ -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;
 	}