projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[firefly-linux-kernel-4.4.55.git]
/
security
/
keys
/
request_key.c
diff --git
a/security/keys/request_key.c
b/security/keys/request_key.c
index 0d625312427831b63ed18784719cd0b424f03a41..c7a117c9a8f3030d66afc6cbf5767ce5069c813b 100644
(file)
--- a/
security/keys/request_key.c
+++ b/
security/keys/request_key.c
@@
-271,7
+271,7
@@
static void construct_get_dest_keyring(struct key **_dest_keyring)
if (cred->request_key_auth) {
authkey = cred->request_key_auth;
down_read(&authkey->sem);
if (cred->request_key_auth) {
authkey = cred->request_key_auth;
down_read(&authkey->sem);
- rka = authkey->payload.data;
+ rka = authkey->payload.data
[0]
;
if (!test_bit(KEY_FLAG_REVOKED,
&authkey->flags))
dest_keyring =
if (!test_bit(KEY_FLAG_REVOKED,
&authkey->flags))
dest_keyring =
@@
-596,7
+596,7
@@
int wait_for_key_construction(struct key *key, bool intr)
return -ERESTARTSYS;
if (test_bit(KEY_FLAG_NEGATIVE, &key->flags)) {
smp_rmb();
return -ERESTARTSYS;
if (test_bit(KEY_FLAG_NEGATIVE, &key->flags)) {
smp_rmb();
- return key->
type_data.
reject_error;
+ return key->reject_error;
}
return key_validate(key);
}
}
return key_validate(key);
}