Skip to contentSkip to conversation

KEYS: user: Align the payload buffer

PATCH In review Eric Biggers 3 participants 5 messages Jan 15, 2019 – Feb 20, 2019

Subsystems (2)
lore
Share & tools
lore

Eric Biggers

author maintainer
#0 lore raw

PATCH 1/1 KEYS: user: Align the payload buffer

From: Eric Biggers <[email protected]>

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.

Fixes 2aa349f6e37c ("[PATCH] Keys: Export user-defined keyring operations")
Fixes 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities")
---
 include/keys/user-type.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/keys/user-type.h +1 -1
index e098cbe27db54..12babe9915944 100644
@@ -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;
Signature · 1 line
2.20.1
Tested-by on v1 1/1
#1 lore raw

Hi,

Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 5 lines
Fixes 2aa349f6e37c ("[PATCH] Keys: Export user-defined keyring operations")
Fixes 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities")

This fixes the "unaligned access" dmesg spam on SPARC when using ext4 encryption.

Thanks,

A.

Quoted 20 lines
---
 include/keys/user-type.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/keys/user-type.h +1 -1
index e098cbe27db54..12babe9915944 100644
@@ -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;
Signature · 1 line
2.20.1
author maintainer
#2 lore raw
In reply to Eric Biggers
Quoted 36 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Fixes 2aa349f6e37c ("[PATCH] Keys: Export user-defined keyring operations")
Fixes 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities")
---
 include/keys/user-type.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/keys/user-type.h +1 -1
index e098cbe27db54..12babe9915944 100644
@@ -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;
Signature · 1 line
2.20.1

Ping. David, are you planning to apply this?

- Eric

author maintainer
#3 lore raw
Quoted 33 lines · Eric Biggers
Quoted 32 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Fixes 2aa349f6e37c ("[PATCH] Keys: Export user-defined keyring operations")
Fixes 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities")
---
 include/keys/user-type.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/keys/user-type.h +1 -1
index e098cbe27db54..12babe9915944 100644
@@ -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 */
 };
 
Quoted 8 lines
Quoted 4 lines
include/keys/user-type.h +0 -0
 extern struct key_type key_type_user;
Signature · 1 line
2.20.1

Ping. David, are you planning to apply this?

- Eric

Ping.