]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ethernet: cadence: fix socket buffer corruption problem
authorTristram Ha <Tristram.Ha@microchip.com>
Wed, 24 Oct 2018 21:51:23 +0000 (14:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 1 Dec 2019 08:17:00 +0000 (09:17 +0100)
[ 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

index 74eeb3a985bf1e140fa1b7b623a7d1016ac7716b..f175b20ac510afb2d0dab68c7be3aaae7c9717e1 100644 (file)
@@ -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;