diff options
| author | Martin Schiller <ms@dev.tdt.de> | 2020-01-21 10:42:33 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-01-26 19:23:46 +0100 |
| commit | 3212290a3bde5720ea22aff55aec83940128375f (patch) | |
| tree | 1a071d5ea118196586d53a9878e0884177458773 | |
| parent | 6ee0138a6cd8f274b82279f995ba6d0e55e09a91 (diff) | |
| download | upstream-3212290a3bde5720ea22aff55aec83940128375f.tar.gz upstream-3212290a3bde5720ea22aff55aec83940128375f.tar.bz2 upstream-3212290a3bde5720ea22aff55aec83940128375f.zip | |
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 <ms@dev.tdt.de>
(cherry picked from commit 996f02e5bafad2815e72821c19d41fb5297e4dad)
| -rw-r--r-- | package/kernel/lantiq/ltq-ptm/Makefile | 2 | ||||
| -rw-r--r-- | package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/package/kernel/lantiq/ltq-ptm/Makefile b/package/kernel/lantiq/ltq-ptm/Makefile index 73fd63f42b..8f4db69411 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_MAINTAINER:=John Crispin <john@phrozen.org> PKG_LICENSE:=GPL-2.0+ 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 9e24c69d94..46a52e29d8 100644 --- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c +++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c @@ -336,6 +336,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 *)); |