summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2014-07-21 00:06:48 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-28 08:00:06 -0700
commit72a0a659b5b2aa6a8d3ade5a7fbd0578bd1dd749 (patch)
tree323505e4d667baa990be9948252d3b61c17c1bf3 /net
parent443ba0f457a6c5f2eeec64fe3f80efc7cbb10133 (diff)
downloadlinux-3.10-72a0a659b5b2aa6a8d3ade5a7fbd0578bd1dd749.tar.gz
linux-3.10-72a0a659b5b2aa6a8d3ade5a7fbd0578bd1dd749.tar.bz2
linux-3.10-72a0a659b5b2aa6a8d3ade5a7fbd0578bd1dd749.zip
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/dns_resolver/dns_query.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index ede0e2d7412..2022b46ab38 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;