diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 13:09:18 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-21 13:09:18 +0200 |
commit | a2ab5fc41533c952706ebdfaa378bb746e535cc1 (patch) | |
tree | 9fb86bb4e9ecb67f7e651d284c2f12c6c5d4378f /security/keys/key.c | |
parent | a380f2edef65b2447a043251bb3c00a9d2153a8b (diff) | |
parent | 0e708fc602531b8355b5de6ea7c98f09129b223f (diff) | |
download | linux-a2ab5fc41533c952706ebdfaa378bb746e535cc1.tar.gz |
Merge branch 'pm-sleep' into pm-core
Diffstat (limited to 'security/keys/key.c')
-rw-r--r-- | security/keys/key.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 83da68d98b40..eb914a838840 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -54,10 +54,10 @@ void __key_check(const struct key *key) struct key_user *key_user_lookup(kuid_t uid) { struct key_user *candidate = NULL, *user; - struct rb_node *parent = NULL; - struct rb_node **p; + struct rb_node *parent, **p; try_again: + parent = NULL; p = &key_user_tree.rb_node; spin_lock(&key_user_lock); @@ -302,6 +302,8 @@ struct key *key_alloc(struct key_type *type, const char *desc, key->flags |= 1 << KEY_FLAG_IN_QUOTA; if (flags & KEY_ALLOC_BUILT_IN) key->flags |= 1 << KEY_FLAG_BUILTIN; + if (flags & KEY_ALLOC_UID_KEYRING) + key->flags |= 1 << KEY_FLAG_UID_KEYRING; #ifdef KEY_DEBUGGING key->magic = KEY_DEBUG_MAGIC; |