diff options
| author | Manuel Schölling <manuel.schoelling@gmx.de> | 2014-06-07 23:57:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-28 08:00:06 -0700 |
| commit | 443ba0f457a6c5f2eeec64fe3f80efc7cbb10133 (patch) | |
| tree | 139cfe9f28f1eb942e4e8fb88911c61f6a11607f /net/dns_resolver | |
| parent | 1c81dac91e065e39413f8ff5d22b444087b0ed11 (diff) | |
| download | linux-3.10-443ba0f457a6c5f2eeec64fe3f80efc7cbb10133.tar.gz linux-3.10-443ba0f457a6c5f2eeec64fe3f80efc7cbb10133.tar.bz2 linux-3.10-443ba0f457a6c5f2eeec64fe3f80efc7cbb10133.zip | |
dns_resolver: assure that dns_query() result is null-terminated
[ Upstream commit 84a7c0b1db1c17d5ded8d3800228a608e1070b40 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/dns_resolver')
| -rw-r--r-- | net/dns_resolver/dns_query.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c index c32be292c7e..ede0e2d7412 100644 --- a/net/dns_resolver/dns_query.c +++ b/net/dns_resolver/dns_query.c @@ -150,7 +150,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; |