lkml.org 
[lkml]   [2021]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 31/71] sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
    Date
    From: Kees Cook <keescook@chromium.org>

    [ Upstream commit 224004fbb033600715dbd626bceec10bfd9c58bc ]

    In preparation for FORTIFY_SOURCE performing compile-time and run-time
    field bounds checking for memcpy(), memmove(), and memset(), avoid
    intentionally reading across neighboring array fields.

    The memcpy() is copying the entire structure, not just the first array.
    Adjust the source argument so the compiler can do appropriate bounds
    checking.

    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/renesas/sh_eth.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
    index a042f4607b0d..931a44fe7afe 100644
    --- a/drivers/net/ethernet/renesas/sh_eth.c
    +++ b/drivers/net/ethernet/renesas/sh_eth.c
    @@ -2322,7 +2322,7 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
    {
    switch (stringset) {
    case ETH_SS_STATS:
    - memcpy(data, *sh_eth_gstrings_stats,
    + memcpy(data, sh_eth_gstrings_stats,
    sizeof(sh_eth_gstrings_stats));
    break;
    }
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-28 17:10    [W:10.144 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site