lkml.org 
[lkml]   [2014]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 16/23] dns_resolver: Null-terminate the right string
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Hutchings <ben@decadent.org.uk>

    [ Upstream commit 640d7efe4c08f06c4ae5d31b79bd8740e7f6790a ]

    *_result[len] is parsed as *(_result[len]) which is not at all what we
    want to touch here.

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Fixes: 84a7c0b1db1c ("dns_resolver: assure that dns_query() result is null-terminated")
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/dns_resolver/dns_query.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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 ch
    goto put;

    memcpy(*_result, upayload->data, len);
    - *_result[len] = '\0';
    + (*_result)[len] = '\0';

    if (_expiry)
    *_expiry = rkey->expiry;



    \
     
     \ /
      Last update: 2014-07-26 23:21    [W:2.724 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site