Unverified Commit 547bed38 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9619 r8169: Fix possible ring buffer corruption on fragmented Tx packets. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OB6WLAHSSK3RPYVUUOAX2SOJ63QZQON5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SF4 
 
Link:https://gitee.com/openeuler/kernel/pulls/9619

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e2febfbf 7b7963b6

drivers/net/ethernet/realtek/r8169_main.c

+2 −1
Original line number Diff line number Diff line
@@ -4246,11 +4246,11 @@ static void rtl8169_doorbell(struct rtl8169_private *tp) 
static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,

				      struct net_device *dev)

{

	unsigned int frags = skb_shinfo(skb)->nr_frags;

	struct rtl8169_private *tp = netdev_priv(dev);

	unsigned int entry = tp->cur_tx % NUM_TX_DESC;

	struct TxDesc *txd_first, *txd_last;

	bool stop_queue, door_bell;

	unsigned int frags;

	u32 opts[2];



	if (unlikely(!rtl_tx_slots_avail(tp))) {
@@ -4273,6 +4273,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, 


	txd_first = tp->TxDescArray + entry;



	frags = skb_shinfo(skb)->nr_frags;

	if (frags) {

		if (rtl8169_xmit_frags(tp, skb, opts, entry))

			goto err_dma_1;