Commit cc1780fc authored by Eric Biggers's avatar Eric Biggers Committed by James Morris

KEYS: user: Align the payload buffer

Align the payload of "user" and "logon" keys so that users of the
keyrings service can access it as a struct that requires more than
2-byte alignment.  fscrypt currently does this which results in the read
of fscrypt_key::size being misaligned as it needs 4-byte alignment.

Align to __alignof__(u64) rather than __alignof__(long) since in the
future it's conceivable that people would use structs beginning with
u64, which on some platforms would require more than 'long' alignment.
Reported-by: 's avatarAaro Koskinen <aaro.koskinen@iki.fi>
Fixes: 2aa349f6 ("[PATCH] Keys: Export user-defined keyring operations")
Fixes: 88bd6ccd ("ext4 crypto: add encryption key management facilities")
Cc: stable@vger.kernel.org
Signed-off-by: 's avatarEric Biggers <ebiggers@google.com>
Tested-by: 's avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: 's avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: 's avatarJames Morris <james.morris@microsoft.com>
parent 8a61716f
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment