net: dsa: ksz: don't pad a cloned sk_buff
PATCH 1/1 net: dsa: ksz: don't pad a cloned sk_buff
If the supplied sk_buff is cloned (e.g. in dsa_skb_tx_timestamp()), __skb_put_padto() will allocate a new sk_buff with size = skb->len + padlen. So the condition just tested for (skb_tailroom(skb) >= padlen + len) is not fulfilled anymore. Although the real size will usually be larger than skb->len + padlen (due to alignment), there is no guarantee that the required memory for the tail tag will be available
Instead of letting __skb_put_padto allocate a new (too small) sk_buff, lets take the already existing path and allocate a new sk_buff ourself (with sufficient size).
---
I am not sure whether this is a problem for current kernels (it depends whether cloned sk_buffs can happen on any paths). But when adding time stamping (will be submitted soon), this will become an issue.
This patch supersedes "net: dsa: ksz: fix padding size of skb" from yesterday.
net/dsa/tag_ksz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/dsa/tag_ksz.c +2 -2
@@ -22,7 +22,7 @@ static struct sk_buff *ksz_common_xmit(struct sk_buff *skb, padlen = (skb->len >=ETH_ZLEN ) ?0 :ETH_ZLEN - skb->len; -if (skb_tailroom (skb) >= padlen + len) { +if (skb_tailroom (skb) >= padlen + len && !skb_cloned (skb)) {/* Let dsa_slave_xmit() free skb */ if (__skb_put_padto (skb, skb->len + padlen, false))return NULL ;
@@ -45,7 +45,7 @@ static struct sk_buff *ksz_common_xmit(struct sk_buff *skb,/* Let skb_put_padto() free nskb, and let dsa_slave_xmit() free * skb */ -if (skb_put_padto (nskb, nskb->len + padlen)) +if (skb_put_padto (nskb,ETH_ZLEN + len))return NULL ;consume_skb (skb);
Signature · 8 lines
Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
Andrew Lunn
maintainerQuoted 10 lines · Christian Eggers
If the supplied
sk_buffis cloned (e.g. indsa_skb_tx_timestamp()),__skb_put_padto()will allocate a newsk_buffwith size =skb->len+ padlen. So the condition just tested for (skb_tailroom(skb)>= padlen + len) is not fulfilled anymore. Although the real size will usually be larger thanskb->len+ padlen (due to alignment), there is no guarantee that the required memory for the tail tag will be availableInstead of letting
__skb_put_padtoallocate a new (too small)sk_buff, lets take the already existing path and allocate a newsk_buffourself (with sufficient size).
Hi Christian
What is not clear to me is why not change the __skb_put_padto() call to pass the correct length?
Andrew
Vladimir Oltean
maintainerQuoted 8 lines · Andrew Lunn
Quoted 7 lines · Christian Eggers
If the supplied
sk_buffis cloned (e.g. indsa_skb_tx_timestamp()),__skb_put_padto()will allocate a newsk_buffwith size =skb->len+ padlen. So the condition just tested for (skb_tailroom(skb)>= padlen + len) is not fulfilled anymore. Although the real size will usually be larger thanskb->len+ padlen (due to alignment), there is no guarantee that the required memory for the tail tag will be available
Quoted 8 lines
Quoted 3 lines
Instead of letting
__skb_put_padtoallocate a new (too small)sk_buff, lets take the already existing path and allocate a newsk_buffourself (with sufficient size).Hi Christian
What is not clear to me is why not change the
__skb_put_padto()call to pass the correct length?
There is a second call to skb_put that increases the skb->len further from the tailroom area. See Christian's other patch.
I would treat this patch as "premature" until we fully understand what's going on there.