lkml.org 
[lkml]   [2019]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 06/70] net: mvpp2: Use strscpy to handle stat strings
    Date
    From: Maxime Chevallier <maxime.chevallier@bootlin.com>

    [ Upstream commit d37acd5aa99c57505b64913e0e2624ec3daed8c5 ]

    Use a safe strscpy call to copy the ethtool stat strings into the
    relevant buffers, instead of a memcpy that will be accessing
    out-of-bound data.

    Fixes: 118d6298f6f0 ("net: mvpp2: add ethtool GOP statistics")
    Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    @@ -1304,8 +1304,8 @@ static void mvpp2_ethtool_get_strings(st
    int i;

    for (i = 0; i < ARRAY_SIZE(mvpp2_ethtool_regs); i++)
    - memcpy(data + i * ETH_GSTRING_LEN,
    - &mvpp2_ethtool_regs[i].string, ETH_GSTRING_LEN);
    + strscpy(data + i * ETH_GSTRING_LEN,
    + mvpp2_ethtool_regs[i].string, ETH_GSTRING_LEN);
    }
    }


    \
     
     \ /
      Last update: 2019-06-09 19:22    [W:6.107 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site