From: Martin Schiller Date: Tue, 21 Jan 2020 09:42:33 +0000 (+0100) Subject: lantiq: ltq-ptm: vr9: fix skb handling in ptm_hard_start_xmit() X-Git-Tag: v18.06.7~3 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ebafb746f03e642740159614245e67017734db29;p=openwrt%2Fopenwrt.git lantiq: ltq-ptm: vr9: fix skb handling in ptm_hard_start_xmit() Call skb_orphan(skb) to call the owner's destructor function and make the skb unowned. This is necessary to prevent sk_wmem_alloc of a socket from overflowing, which leads to ENOBUFS errors on application level. Signed-off-by: Martin Schiller (cherry picked from commit 996f02e5bafad2815e72821c19d41fb5297e4dad) --- diff --git a/package/kernel/lantiq/ltq-ptm/Makefile b/package/kernel/lantiq/ltq-ptm/Makefile index 13831a2b6f..abc6c3daab 100644 --- a/package/kernel/lantiq/ltq-ptm/Makefile +++ b/package/kernel/lantiq/ltq-ptm/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ltq-ptm -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/ltq-ptm-$(BUILD_VARIANT) PKG_MAINTAINER:=John Crispin diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c index 9cfeefd80e..0162beef21 100644 --- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c +++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c @@ -334,6 +334,9 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) dma_cache_wback((unsigned long)skb->data, skb->len); } + /* make the skb unowned */ + skb_orphan(skb); + *(struct sk_buff **)((unsigned int)skb->data - byteoff - sizeof(struct sk_buff *)) = skb; /* write back to physical memory */ dma_cache_wback((unsigned long)skb->data - byteoff - sizeof(struct sk_buff *), skb->len + byteoff + sizeof(struct sk_buff *));