aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorManuel Schölling <manuel.schoelling@gmx.de>2014-06-07 23:57:25 +0200
committerDavid S. Miller <davem@davemloft.net>2014-06-11 00:12:04 -0700
commit84a7c0b1db1c17d5ded8d3800228a608e1070b40 (patch)
tree95c67ab040a0fe4ade6d48902d6b5309c7f60370 /net
parentipip, sit: fix ipv4_{update_pmtu,redirect} calls (diff)
downloadlinux-dev-84a7c0b1db1c17d5ded8d3800228a608e1070b40.tar.xz
linux-dev-84a7c0b1db1c17d5ded8d3800228a608e1070b40.zip
dns_resolver: assure that dns_query() result is null-terminated
dns_query() credulously assumes that keys are null-terminated and returns a copy of a memory block that is off by one. Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dns_resolver/dns_query.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index e7b6d53eef88..6853d22ebc07 100644
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -149,7 +149,9 @@ int dns_query(const char *type, const char *name, size_t namelen,
if (!*_result)
goto put;
- memcpy(*_result, upayload->data, len + 1);
+ memcpy(*_result, upayload->data, len);
+ *_result[len] = '\0';
+
if (_expiry)
*_expiry = rkey->expiry;