[PATCH v2 net] dns_resolver: Null-terminate the right string

[PATCH v2 net] dns_resolver: Null-terminate the right string

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 883 bytes --]

*_result[len] is parsed as *(_result[len]) which is not at all what we
want to touch here.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Fixes: 84a7c0b1db1c ("dns_resolver: assure that dns_query() result is null-terminated")
---
v2: Add the Fixes header

 net/dns_resolver/dns_query.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index 9acec61f..dd8696a 100644
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -150,7 +150,7 @@ int dns_query(const char *type, const char *name, size_t namelen,
 		goto put;
 
 	memcpy(*_result, upayload->data, len);
-	*_result[len] = '\0';
+	(*_result)[len] = '\0';
 
 	if (_expiry)
 		*_expiry = rkey->expiry;


-- 
Ben Hutchings
Make three consecutive correct guesses and you will be considered an expert.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

Re: [PATCH v2 net] dns_resolver: Null-terminate the right string

[David Miller]

From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 21 Jul 2014 00:06:48 +0100

> *_result[len] is parsed as *(_result[len]) which is not at all what we
> want to touch here.
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> Fixes: 84a7c0b1db1c ("dns_resolver: assure that dns_query() result is null-terminated")
> ---
> v2: Add the Fixes header

Applied, thanks Ben.