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

!13933 net: ethernet: lantiq_etop: fix memory disclosure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2BPJUIRMXXCUKNBW6Y447L4DXAGTICIN/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRCJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/13933

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 60a1c16b f35da30f

drivers/net/ethernet/lantiq_etop.c

+3 −1
Original line number Diff line number Diff line
@@ -464,7 +464,9 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) 
	unsigned long flags;

	u32 byte_offset;



	len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;

	if (skb_put_padto(skb, ETH_ZLEN))

		return NETDEV_TX_OK;

	len = skb->len;



	if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) {

		netdev_err(dev, "tx ring full\n");