diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 +0000 |
| commit | 9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf (patch) | |
| tree | 158cd337307a4a4e09a3fb5110f29ab0136bef6c /security/keys/user_defined.c | |
| parent | ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts (diff) | |
| parent | MFD: ucb1x00-ts: fix resume failure (diff) | |
| download | linux-dev-9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf.tar.xz linux-dev-9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf.zip | |
Merge branch 'sa11x0-mcp-fixes' into fixes
Diffstat (limited to 'security/keys/user_defined.c')
| -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); } } |