]> Pileus Git - ~andy/linux/commitdiff
tipc: reassembly failures should cause link reset
authorErik Hugne <erik.hugne@ericsson.com>
Wed, 6 Nov 2013 08:28:07 +0000 (09:28 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Nov 2013 23:30:11 +0000 (18:30 -0500)
If appending a received fragment to the pending fragment chain
in a unicast link fails, the current code tries to force a retransmission
of the fragment by decrementing the 'next received sequence number'
field in the link. This is done under the assumption that the failure
is caused by an out-of-memory situation, an assumption that does
not hold true after the previous patch in this series.

A failure to append a fragment can now only be caused by a protocol
violation by the sending peer, and it must hence be assumed that it
is either malicious or buggy.  Either way, the correct behavior is now
to reset the link instead of trying to revert its sequence number.
So, this is what we do in this commit.

Signed-off-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tipc/link.c

index a63646e6c2cf05eb620e914577ae299fa59cd436..cf465d66ccdec9506bab01cb7390fcd169b50dfc 100644 (file)
@@ -1652,7 +1652,7 @@ deliver:
                                goto deliver;
                        }
                        if (ret == LINK_REASM_ERROR)
-                               l_ptr->next_in_no--;
+                               tipc_link_reset(l_ptr);
                        tipc_node_unlock(n_ptr);
                        continue;
                case CHANGEOVER_PROTOCOL: