Skip to contentSkip to conversation

keys, dns: Drop unused NUL terminator from upayload->data

PATCH Applied Thorsten Blum 4 participants 4 messages Aug 6 – Aug 10

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 keys, dns: Drop unused NUL terminator from upayload->data

upayload->data includes an extra NUL terminator even though it is never used as a C string. In-tree users access only the first upayload->datalen bytes.

Remove the redundant NUL terminator and allocate one byte less for upayload->data in dns_resolver_preparse().

---
Changes in v4:
- Drop patch 2/2 from the series and submit 1/2 as a standalone patch
- Reword subject and patch description
- v3: https://lore.kernel.org/r/[email protected]/

Changes in v3:
- Update commit message
- v2: https://lore.kernel.org/r/[email protected]/

Changes in v2:
- No changes in patch 1/2
- v1: https://lore.kernel.org/r/[email protected]/

---
 net/dns_resolver/dns_key.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/dns_resolver/dns_key.c +1 -2
index c3c8c3240ef9..451247864a63 100644
@@ -203,7 +203,7 @@ dns_resolver_preparse(struct key_preparsed_payload *prep)
 	kdebug("store result");
 	prep->quotalen = result_len;
 
-	upayload = kmalloc_flex(*upayload, data, result_len + 1);
+	upayload = kmalloc_flex(*upayload, data, result_len);
 	if (!upayload) {
 		kleave(" = -ENOMEM");
 		return -ENOMEM;
@@ -211,7 +211,6 @@ dns_resolver_preparse(struct key_preparsed_payload *prep)
 
 	upayload->datalen = result_len;
 	memcpy(upayload->data, data, result_len);
-	upayload->data[result_len] = '\0';
 
 	prep->payload.data[dns_key_data] = upayload;
 	kleave(" = 0");
reviewer Reviewed-by on v4 1/1
#1 lore raw
Quoted 7 lines · Thorsten Blum

upayload->data includes an extra NUL terminator even though it is never used as a C string. In-tree users access only the first upayload->datalen bytes.

Remove the redundant NUL terminator and allocate one byte less for upayload->data in dns_resolver_preparse().

Quoted 6 lines

---
Changes in v4:
- Drop patch 2/2 from the series and submit 1/2 as a standalone patch
- Reword subject and patch description
- v3: https://lore.kernel.org/r/[email protected]/

Separating this patch out makes sense to me.
And the updated patch description looks good.

Thanks.

maintainer
#2 lore raw
In reply to Thorsten Blum
Quoted 6 lines · On Thu, 6 Aug 2026 22:04:54 +0200 Thorsten Blum wrote:

upayload->data includes an extra NUL terminator even though it is never used as a C string. In-tree users access only the first upayload->datalen bytes.

Remove the redundant NUL terminator and allocate one byte less for upayload->data in dns_resolver_preparse().

Okay. You know how I feel about this change already. I'll apply but please adjust your filter for changes which are worth maintainer's time

#3 lore raw
In reply to Thorsten Blum
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Thu, 6 Aug 2026 22:04:54 +0200 you wrote:

upayload->data includes an extra NUL terminator even though it is never used as a C string. In-tree users access only the first upayload->datalen bytes.

Remove the redundant NUL terminator and allocate one byte less for upayload->data in dns_resolver_preparse().

[...]

Here is the summary with links:
- [net-next,v4] keys, dns: Drop unused NUL terminator from upayload->data

    https://git.kernel.org/netdev/net-next/c/f1529936c0b6

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html