Merge tag 'v3.10.67' into update

This is the 3.10.67 stable release
2018-03-21 22:36:30 +01:00
parent 3219320124 4227cffc1f
commit b2d402e5a4
140 changed files with 610 additions and 179 deletions
@@ -201,12 +201,12 @@ static noinline void key_gc_unused_keys(struct list_head *keys)
 		if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags))
 			atomic_dec(&key->user->nikeys);

-		key_user_put(key->user);
-
 		/* now throw away the key memory */
 		if (key->type->destroy)
 			key->type->destroy(key);

+		key_user_put(key->user);
+
 		kfree(key->description);

 #ifdef KEY_DEBUGGING