diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-09-30 10:44:04 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-09-30 10:44:04 -0400 |
| commit | 6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1 (patch) | |
| tree | 2ab49b7d19fb69cdae5b6be9e7ba44f6cf3d45ef /net/dns_resolver | |
| parent | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (diff) | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
Merge commit 'v3.16' into next
Diffstat (limited to 'net/dns_resolver')
| -rw-r--r-- | net/dns_resolver/dns_query.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c index 9a32f55cf9b9..39d2c39bdf87 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, | |||
| 151 | goto put; | 151 | goto put; |
| 152 | 152 | ||
| 153 | memcpy(*_result, upayload->data, len); | 153 | memcpy(*_result, upayload->data, len); |
| 154 | *_result[len] = '\0'; | 154 | (*_result)[len] = '\0'; |
| 155 | 155 | ||
| 156 | if (_expiry) | 156 | if (_expiry) |
| 157 | *_expiry = rkey->expiry; | 157 | *_expiry = rkey->expiry; |