]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
tipc: mark head of reassembly buffer as non-linear
authorJon Paul Maloy <jon.maloy@ericsson.com>
Wed, 14 May 2014 09:39:11 +0000 (05:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 14 May 2014 19:19:48 +0000 (15:19 -0400)
The message reassembly function does not update the 'len' and 'data_len'
fields of the head skbuff correctly when fragments are chained to it.
This may sometimes lead to obsure errors, such as fragment reordering
when we receive fragments which are cloned buffers.

This commit fixes this, by ensuring that the two fields are updated
correctly.

Suggested-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tipc/link.c

index 6cf7938784c64d972befb2a8c5acdd89996d3be3..9272d4cc0225cafa24089d65a1f60d91c56cf9b2 100644 (file)
@@ -2341,6 +2341,8 @@ int tipc_link_frag_rcv(struct sk_buff **head, struct sk_buff **tail,
                        (*tail)->next = frag;
                *tail = frag;
                (*head)->truesize += frag->truesize;
+               (*head)->data_len += frag->len;
+               (*head)->len += frag->len;
        }
        if (fragid == LAST_FRAGMENT) {
                *fbuf = *head;