From 67dfc2b4ae9e109da254279d00fa9c6a8c345a62 Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Wed, 18 Jan 2012 10:03:14 +0000 Subject: [PATCH] --- yaml --- r: 286540 b: refs/heads/master c: f6b24579d099ebb67f39cd7924a72a7eec0ce6ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/keys/user_defined.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2f9910904a31..4b349ec3cc43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3db59dd93309710c40aaf1571c607cb0feef3ecb +refs/heads/master: f6b24579d099ebb67f39cd7924a72a7eec0ce6ae diff --git a/trunk/security/keys/user_defined.c b/trunk/security/keys/user_defined.c index 69ff52c08e97..2aee3c5a3b99 100644 --- a/trunk/security/keys/user_defined.c +++ b/trunk/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); } }