commits December 2014

commits@lists.open-mesh.org

1 participants
14 discussions

[batman-adv] next's head updated: Merge branch 'maint' into next (a053f89)
by postmaster＠open-mesh.org 08 Dec '14

08 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 210a3cb batman-adv: Calculate extra tail size based on queued fragments a053f89 Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (a053f89)
by postmaster＠open-mesh.org 08 Dec '14

08 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit a053f89ad8acc371c2eb04ccc7ac1f7f3763c98e Merge: 5105158 210a3cb Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Dec 8 11:39:42 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- a053f89ad8acc371c2eb04ccc7ac1f7f3763c98e fragmentation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[batman-adv] maint: batman-adv: Calculate extra tail size based on queued fragments (210a3cb)
by postmaster＠open-mesh.org 08 Dec '14

08 Dec '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 210a3cb5a5e09f0067386fd07b3a7a843fcf66c5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 1 10:32:10 2014 +0100 batman-adv: Calculate extra tail size based on queued fragments The fragmentation code was replaced in 9b3eab61754d74a93c9840c296013fe3b4a1b606 ("batman-adv: Receive fragmented packets and merge"). The new code provided a mostly unused parameter skb for the merging function. It is used inside the function to calculate the additionally needed skb tailroom. But instead of increasing its own tailroom, it is only increasing the tailroom of the first queued skb. This is not correct in some situations because the first queued entry can be a different one than the parameter. An observed problem was: 1. packet with size 104, total_size 1464, fragno 1 was received - packet is queued 2. packet with size 1400, total_size 1464, fragno 0 was received - packet is queued at the end of the list 3. enough data was received and can be given to the merge function (1464 == (1400 - 20) + (104 - 20)) - merge functions gets 1400 byte large packet as skb argument 4. merge function gets first entry in queue (104 byte) - stored as skb_out 5. merge function calculates the required extra tail as total_size - skb->len - pskb_expand_head tail of skb_out with 64 bytes 6. merge function tries to squeeze the extra 1380 bytes from the second queued skb (1400 byte aka skb parameter) in the 64 extra tail bytes of skb_out Instead calculate the extra required tail bytes for skb_out also using skb_out instead of using the parameter skb. The skb parameter is only used to get the total_size from the last received packet. This is also the total_size used to decide that all fragments were received. Reported-by: Philipp Psurek <philipp.psurek(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 210a3cb5a5e09f0067386fd07b3a7a843fcf66c5 fragmentation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragmentation.c b/fragmentation.c index f14e54a..af16844 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -247,7 +247,7 @@ batadv_frag_merge_packets(struct hlist_head *chain, struct sk_buff *skb) kfree(entry); /* Make room for the rest of the fragments. */ - if (pskb_expand_head(skb_out, 0, size - skb->len, GFP_ATOMIC) < 0) { + if (pskb_expand_head(skb_out, 0, size - skb_out->len, GFP_ATOMIC) < 0) { kfree_skb(skb_out); skb_out = NULL; goto free;

1 0

[linux-merge]linux integration; annotated tag, v3.18-rc7, created. v3.18-rc7
by postmaster＠open-mesh.org 01 Dec '14

01 Dec '14

The annotated tag, v3.18-rc7 has been created at 35e8bc566ae51bfdeafbb9328377cb20b0afd2a7 (tag) tagging 009d0431c3914de64666bec0d350e54fdd59df6a (commit) replaces v3.18-rc6 tagged by Linus Torvalds on Sun Nov 30 16:42:37 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.18-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM= =kG1Y -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2014