diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2012-01-18 10:03:14 +0000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-01-19 16:16:29 +1100 |
| commit | f6b24579d099ebb67f39cd7924a72a7eec0ce6ae (patch) | |
| tree | a97004bb108138294b77e98466a4b9e76a9a198c | |
| parent | 3db59dd93309710c40aaf1571c607cb0feef3ecb (diff) | |
| download | linux-stable-f6b24579d099ebb67f39cd7924a72a7eec0ce6ae.tar.gz linux-stable-f6b24579d099ebb67f39cd7924a72a7eec0ce6ae.tar.bz2 linux-stable-f6b24579d099ebb67f39cd7924a72a7eec0ce6ae.zip | |
keys: fix user_defined key sparse messages
Replace the rcu_assign_pointer() calls with rcu_assign_keypointer().
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | security/keys/user_defined.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c index 69ff52c08e97..2aee3c5a3b99 100644 --- a/security/keys/user_defined.c +++ b/security/keys/user_defined.c @@ -59,7 +59,7 @@ int user_instantiate(struct key *key, const void *data, size_t datalen) /* attach the data */ upayload->datalen = datalen; memcpy(upayload->data, data, datalen); - rcu_assign_pointer(key->payload.data, upayload); + rcu_assign_keypointer(key, upayload); ret = 0; error: @@ -98,7 +98,7 @@ int user_update(struct key *key, const void *data, size_t datalen) if (ret == 0) { /* attach the new data, displacing the old */ zap = key->payload.data; - rcu_assign_pointer(key->payload.data, upayload); + rcu_assign_keypointer(key, upayload); key->expiry = 0; } @@ -133,7 +133,7 @@ void user_revoke(struct key *key) key_payload_reserve(key, 0); if (upayload) { - rcu_assign_pointer(key->payload.data, NULL); + rcu_assign_keypointer(key, NULL); kfree_rcu(upayload, rcu); } } |