This patch fixes the key_ref leak, removes the unnecessary KEY_FLAG_KEEP test before setting the flag, and cleans up the if/then brackets style introduced in commit:
d3600bc KEYS: prevent keys from being removed from specified keyrings

Reported-by David Howells <[email protected]>

Signed-off-by Mimi Zohar <[email protected]>

Acked-by David Howells <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 security/keys/key.c    |    3 +--
 security/keys/keyctl.c |   17 +++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

security/keys/key.c +1 -2

@@ -430,8 +430,7 @@ static int __key_instantiate_and_link(st
 
 			/* and link it into the destination keyring */
 			if (keyring) {
-				if (test_bit(KEY_FLAG_KEEP, &keyring->flags))
-					set_bit(KEY_FLAG_KEEP, &key->flags);
+				set_bit(KEY_FLAG_KEEP, &key->flags);
 
 				__key_link(key, _edit);
 			}

security/keys/keyctl.c +7 ~~-10~~

@@ -387,12 +387,11 @@ long keyctl_revoke_key(key_serial_t id)
 	}
 
 	key = key_ref_to_ptr(key_ref);
+	ret = 0;
 	if (test_bit(KEY_FLAG_KEEP, &key->flags))
-		return -EPERM;
-	else {
+		ret = -EPERM;
+	else
 		key_revoke(key);
-		ret = 0;
-	}
 
 	key_ref_put(key_ref);
 error:

@@ -438,12 +437,11 @@ long keyctl_invalidate_key(key_serial_t
 
 invalidate:
 	key = key_ref_to_ptr(key_ref);
+	ret = 0;
 	if (test_bit(KEY_FLAG_KEEP, &key->flags))
 		ret = -EPERM;
-	else {
+	else
 		key_invalidate(key);
-		ret = 0;
-	}
 error_put:
 	key_ref_put(key_ref);
 error:

@@ -1358,12 +1356,11 @@ long keyctl_set_timeout(key_serial_t id,
 
 okay:
 	key = key_ref_to_ptr(key_ref);
+	ret = 0;
 	if (test_bit(KEY_FLAG_KEEP, &key->flags))
 		ret = -EPERM;
-	else {
+	else
 		key_set_timeout(key, timeout);
-		ret = 0;
-	}
 	key_put(key);
 
 error:

Patches currently in stable-queue which might be from [email protected] are

queue-4.3/tpm-tpm_tis-fix-tpm_tis-acpi-detection-issue-with-tpm-2.0.patch queue-4.3/keys-refcount-bug-fix.patch queue-4.3/keys-prevent-keys-from-being-removed-from-specified-keyrings.patch