Skip to content

Commit cc6528b

Browse files
hkallweitkuba-moo
authored andcommitted
r8169: fix potential skb double free in an error path
The caller of rtl8169_tso_csum_v2() frees the skb if false is returned. eth_skb_pad() internally frees the skb on error what would result in a double free. Therefore use __skb_put_padto() directly and instruct it to not free the skb on error. Fixes: b423e9a ("r8169: fix offloaded tx checksum for small packets.") Reported-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/f7e68191-acff-9ded-4263-c016428a8762@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 86bbf01 commit cc6528b

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4163,7 +4163,8 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,
41634163
opts[1] |= transport_offset << TCPHO_SHIFT;
41644164
} else {
41654165
if (unlikely(skb->len < ETH_ZLEN && rtl_test_hw_pad_bug(tp)))
4166-
return !eth_skb_pad(skb);
4166+
/* eth_skb_pad would free the skb on error */
4167+
return !__skb_put_padto(skb, ETH_ZLEN, false);
41674168
}
41684169

41694170
return true;

0 commit comments

Comments
 (0)