lkml.org 
[lkml]   [2014]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 257/259] dns_resolver: assure that dns_query() result is null-terminated
    Date
    3.13.11.6 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= <manuel.schoelling@gmx.de>

    [ 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: Kamal Mostafa <kamal@canonical.com>
    ---
    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 c32be29..ede0e2d 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;

    --
    1.9.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-08-08 23:01    [W:4.706 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site