Merge tag 'v3.10.103' into update

This is the 3.10.103 stable release
2018-03-21 22:58:21 +01:00
parent a8732f92e3 2ecaf1d025
commit b9e7bc93d6
156 changed files with 1693 additions and 1183 deletions
@@ -580,7 +580,7 @@ int key_reject_and_link(struct key *key,

 	mutex_unlock(&key_construction_mutex);

-	if (keyring)
+	if (keyring && link_ret == 0)
 		__key_link_end(keyring, key->type, prealloc);

 	/* wake up anyone waiting for a key to be constructed */