mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
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 <[email protected]> Fixes:2aa349f6e3("[PATCH] Keys: Export user-defined keyring operations") Fixes:88bd6ccdcd("ext4 crypto: add encryption key management facilities") Cc: [email protected] Signed-off-by: Eric Biggers <[email protected]> Tested-by: Aaro Koskinen <[email protected]> Signed-off-by: David Howells <[email protected]> Signed-off-by: James Morris <[email protected]>