From: "Manuel Schölling" <manuel.schoelling@gmx.de>
To: davem@davemloft.net
Cc: jeffrey.t.kirsher@intel.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Manuel Schölling" <manuel.schoelling@gmx.de>
Subject: [PATCH v3] dns_resolver: assure that dns_query() result is null-terminated
Date: Sat, 7 Jun 2014 23:57:25 +0200 [thread overview]
Message-ID: <1402178245-8076-1-git-send-email-manuel.schoelling@gmx.de> (raw)
In-Reply-To: <1402167681-24676-1-git-send-email-manuel.schoelling@gmx.de>
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>
---
net/dns_resolver/dns_query.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index e7b6d53..6853d22 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;
--
1.7.10.4
next prev parent reply other threads:[~2014-06-07 21:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-07 17:56 [PATCH] dns_resolver: assure that dns_query() result is null-terminated Manuel Schölling
2014-06-07 18:54 ` Trond Myklebust
2014-06-07 18:57 ` Manuel Schoelling
2014-06-07 19:01 ` [PATCH v2] " Manuel Schölling
2014-06-07 21:42 ` David Rientjes
2014-06-07 21:53 ` Manuel Schoelling
2014-06-07 22:02 ` David Rientjes
2014-06-07 21:57 ` Sergei Shtylyov
2014-06-07 21:57 ` Manuel Schölling [this message]
2014-06-11 7:12 ` [PATCH v3] " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402178245-8076-1-git-send-email-manuel.schoelling@gmx.de \
--to=manuel.schoelling@gmx.de \
--cc=davem@davemloft.net \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).