diff options
| author | Sven Eckelmann <sven@narfation.org> | 2014-08-15 10:19:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-17 04:19:08 +0200 |
| commit | e050dbeb0d1e19072d0d656b51f06af1af860f19 (patch) | |
| tree | ca105c43b61e75c6838003abbbdd822e037b19c7 /net | |
| parent | Merge branch 'bcm7xxx' (diff) | |
| download | linux-e050dbeb0d1e19072d0d656b51f06af1af860f19.tar.xz linux-e050dbeb0d1e19072d0d656b51f06af1af860f19.zip | |
batman-adv: Fix parameter order of hlist_add_behind
1d023284c31a4e40a94d5bbcb7dbb7a35ee0bcbc ("list: fix order of arguments for
hlist_add_after(_rcu)") was incorrectly rebased on top of
d9124268d84a836f14a6ead54ff9d8eee4c43be5 ("batman-adv: Fix out-of-order
fragmentation support"). The parameter order change of the rebased patch was
not re-applied as expected. This causes a memory leak and can cause crashes
when out-of-order packets are received. hlist_add_behind will try to access the
uninitalized list pointers of frag_entry_new to find the previous/next entry
and may modify/read random memory locations.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/fragmentation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 52c43f904220..fc1835c6bb40 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -188,7 +188,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, /* Reached the end of the list, so insert after 'frag_entry_last'. */ if (likely(frag_entry_last)) { - hlist_add_behind(&frag_entry_last->list, &frag_entry_new->list); + hlist_add_behind(&frag_entry_new->list, &frag_entry_last->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; ret = true; |