lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 141/306] net: ethernet: cadence: fix socket buffer corruption problem
    Date
    From: Tristram Ha <Tristram.Ha@microchip.com>

    [ Upstream commit 899ecaedd15599c22553d158f53b127cc1632dc2 ]

    Socket buffer is not re-created when headroom is 2 and tailroom is 1.

    Signed-off-by: Tristram Ha <Tristram.Ha@microchip.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/cadence/macb_main.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
    index 74eeb3a985bf1..f175b20ac510a 100644
    --- a/drivers/net/ethernet/cadence/macb_main.c
    +++ b/drivers/net/ethernet/cadence/macb_main.c
    @@ -1721,7 +1721,7 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)
    padlen = 0;
    /* No room for FCS, need to reallocate skb. */
    else
    - padlen = ETH_FCS_LEN - tailroom;
    + padlen = ETH_FCS_LEN;
    } else {
    /* Add room for FCS. */
    padlen += ETH_FCS_LEN;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 22:26    [W:4.115 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site