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: Aaro Koskinen <aaro.koskinen@iki.fi>
Fixes: 2aa349f6e37c ("[PATCH] Keys: Export user-defined keyring operations")
Fixes: 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities")
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
|
||
|---|---|---|
| .. | ||
| asymmetric-parser.h | ||
| asymmetric-subtype.h | ||
| asymmetric-type.h | ||
| big_key-type.h | ||
| ceph-type.h | ||
| dns_resolver-type.h | ||
| encrypted-type.h | ||
| keyring-type.h | ||
| request_key_auth-type.h | ||
| rxrpc-type.h | ||
| system_keyring.h | ||
| trusted-type.h | ||
| trusted.h | ||
| user-type.h | ||