lkml.org 
[lkml]   [2018]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 25/83] bna: ethtool: Avoid reading past end of buffer
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit 4dc69c1c1fff2f587f8e737e70b4a4e7565a5c94 ]

    Using memcpy() from a string that is shorter than the length copied means
    the destination buffer is being filled with arbitrary data from the kernel
    rodata segment. Instead, use strncpy() which will fill the trailing bytes
    with zeros.

    This was found with the future CONFIG_FORTIFY_SOURCE feature.

    Cc: Daniel Micay <danielmicay@gmail.com>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
    index 31f61a744d66..9473d12ce239 100644
    --- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
    +++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
    @@ -541,8 +541,8 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string)
    for (i = 0; i < BNAD_ETHTOOL_STATS_NUM; i++) {
    BUG_ON(!(strlen(bnad_net_stats_strings[i]) <
    ETH_GSTRING_LEN));
    - memcpy(string, bnad_net_stats_strings[i],
    - ETH_GSTRING_LEN);
    + strncpy(string, bnad_net_stats_strings[i],
    + ETH_GSTRING_LEN);
    string += ETH_GSTRING_LEN;
    }
    bmap = bna_tx_rid_mask(&bnad->bna);
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-19 18:34    [W:4.203 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site