diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-02-20 13:32:11 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-27 10:08:07 +0100 |
| commit | 56a682bde39c5f16135ef513d062ace480ca679e (patch) | |
| tree | 17f78f33d040f2b66eb58217d99a65578b591aeb /include/keys | |
| parent | 4040907e22d2441574871ea35befa4e3d6ec8028 (diff) | |
| download | linux-stable-56a682bde39c5f16135ef513d062ace480ca679e.tar.gz linux-stable-56a682bde39c5f16135ef513d062ace480ca679e.tar.bz2 linux-stable-56a682bde39c5f16135ef513d062ace480ca679e.zip | |
KEYS: user: Align the payload buffer
commit cc1780fc42c76c705dd07ea123f1143dc5057630 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/keys')
| -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; |