Skip to contentSkip to conversation

keys: Use kmalloc_flex() to improve user_preparse()

PATCH In review Thorsten Blum 2 participants 2 messages Mar 2 – Mar 4

Subsystems (2)
Security (LSM) Keys/keyrings
lore
Share & tools
lore

Thorsten Blum

author
#0 lore raw

PATCH 1/1 keys: Use kmalloc_flex() to improve user_preparse()

Use kmalloc_flex() when allocating a new 'struct user_key_payload' in user_preparse() to replace the open-coded size arithmetic and to keep the size type-safe.

Signed-off-by Thorsten Blum <[email protected]>
---
 security/keys/user_defined.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
security/keys/user_defined.c +1 -1
index 686d56e4cc85..6f88b507f927 100644
@@ -64,7 +64,7 @@ int user_preparse(struct key_preparsed_payload *prep)
 	if (datalen == 0 || datalen > 32767 || !prep->data)
 		return -EINVAL;
 
-	upayload = kmalloc(sizeof(*upayload) + datalen, GFP_KERNEL);
+	upayload = kmalloc_flex(*upayload, data, datalen);
 	if (!upayload)
 		return -ENOMEM;
Signature · 2 lines
Thorsten Blum <[email protected]>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4
maintainer
#1 lore raw
Quoted 26 lines · Thorsten Blum

Use kmalloc_flex() when allocating a new 'struct user_key_payload' in user_preparse() to replace the open-coded size arithmetic and to keep the size type-safe.

Signed-off-by Thorsten Blum <[email protected]>
---
 security/keys/user_defined.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
security/keys/user_defined.c +1 -1
index 686d56e4cc85..6f88b507f927 100644
@@ -64,7 +64,7 @@ int user_preparse(struct key_preparsed_payload *prep)
 	if (datalen == 0 || datalen > 32767 || !prep->data)
 		return -EINVAL;
 
-	upayload = kmalloc(sizeof(*upayload) + datalen, GFP_KERNEL);
+	upayload = kmalloc_flex(*upayload, data, datalen);
 	if (!upayload)
 		return -ENOMEM;
Signature · 2 lines
Thorsten Blum <[email protected]>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4

David, do we want this?

BR, Jarkko