| From: Ben Hutchings <ben@decadent.org.uk> |
| Date: Mon, 21 Jul 2014 00:06:48 +0100 |
| Subject: dns_resolver: Null-terminate the right string |
| |
| [ Upstream commit 640d7efe4c08f06c4ae5d31b79bd8740e7f6790a ] |
| |
| *_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") |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| --- |
| 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 ede0e2d..2022b46 100644 |
| --- a/net/dns_resolver/dns_query.c |
| +++ b/net/dns_resolver/dns_query.c |
| @@ -151,7 +151,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; |