diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-22 17:48:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-22 17:48:50 -0800 |
| commit | cb268d806972c76c34e5d74343fb6064cd722c7c (patch) | |
| tree | b51d3f5c0431da9b15c65736fe67f9d27e7aca93 /include | |
| parent | ef4edb3ed830cbbb443de9906b8cf16dc0653a74 (diff) | |
| parent | ede0fa98a900e657d1fcd80b50920efc896c1a4c (diff) | |
Merge branch 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull keys fixes from James Morris:
"Two fixes from Eric Biggers"
* 'fixes-v5.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
KEYS: always initialize keyring_index_key::desc_len
KEYS: user: Align the payload buffer
Diffstat (limited to 'include')
| -rw-r--r-- | include/keys/user-type.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/keys/user-type.h b/include/keys/user-type.h index e098cbe27db5..12babe991594 100644 --- a/include/keys/user-type.h +++ b/include/keys/user-type.h @@ -31,7 +31,7 @@ struct user_key_payload { struct rcu_head rcu; /* RCU destructor */ unsigned short datalen; /* length of this data */ - char data[0]; /* actual data */ + char data[0] __aligned(__alignof__(u64)); /* actual data */ }; extern struct key_type key_type_user; |