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
/
user_defined.c
diff --git
a/security/keys/user_defined.c
b/security/keys/user_defined.c
index 36b47bbd3d8cc277de55e0c0cdd722618ca13231..28cb30f80256911cf9ee41631659b9e8f5a6b5dd 100644
(file)
--- a/
security/keys/user_defined.c
+++ b/
security/keys/user_defined.c
@@
-74,7
+74,7
@@
int user_preparse(struct key_preparsed_payload *prep)
/* attach the data */
prep->quotalen = datalen;
/* attach the data */
prep->quotalen = datalen;
- prep->payload[0] = upayload;
+ prep->payload
.data
[0] = upayload;
upayload->datalen = datalen;
memcpy(upayload->data, prep->data, datalen);
return 0;
upayload->datalen = datalen;
memcpy(upayload->data, prep->data, datalen);
return 0;
@@
-86,7
+86,7
@@
EXPORT_SYMBOL_GPL(user_preparse);
*/
void user_free_preparse(struct key_preparsed_payload *prep)
{
*/
void user_free_preparse(struct key_preparsed_payload *prep)
{
- kfree(prep->payload[0]);
+ kfree(prep->payload
.data
[0]);
}
EXPORT_SYMBOL_GPL(user_free_preparse);
}
EXPORT_SYMBOL_GPL(user_free_preparse);
@@
-120,7
+120,7
@@
int user_update(struct key *key, struct key_preparsed_payload *prep)
if (ret == 0) {
/* attach the new data, displacing the old */
if (ret == 0) {
/* attach the new data, displacing the old */
- zap = key->payload.data;
+ zap = key->payload.data
[0]
;
rcu_assign_keypointer(key, upayload);
key->expiry = 0;
}
rcu_assign_keypointer(key, upayload);
key->expiry = 0;
}
@@
-140,7
+140,7
@@
EXPORT_SYMBOL_GPL(user_update);
*/
void user_revoke(struct key *key)
{
*/
void user_revoke(struct key *key)
{
- struct user_key_payload *upayload = key->payload.data;
+ struct user_key_payload *upayload = key->payload.data
[0]
;
/* clear the quota */
key_payload_reserve(key, 0);
/* clear the quota */
key_payload_reserve(key, 0);
@@
-158,7
+158,7
@@
EXPORT_SYMBOL(user_revoke);
*/
void user_destroy(struct key *key)
{
*/
void user_destroy(struct key *key)
{
- struct user_key_payload *upayload = key->payload.data;
+ struct user_key_payload *upayload = key->payload.data
[0]
;
kfree(upayload);
}
kfree(upayload);
}
@@
-183,10
+183,10
@@
EXPORT_SYMBOL_GPL(user_describe);
*/
long user_read(const struct key *key, char __user *buffer, size_t buflen)
{
*/
long user_read(const struct key *key, char __user *buffer, size_t buflen)
{
- struct user_key_payload *upayload;
+
const
struct user_key_payload *upayload;
long ret;
long ret;
- upayload =
rcu_dereference_key
(key);
+ upayload =
user_key_payload
(key);
ret = upayload->datalen;
/* we can return the data as is */
ret = upayload->datalen;
/* we can return the data as is */