diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-07-11 08:45:27 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-29 17:01:38 +0200 |
| commit | 0515cc266b526def4d880515d3ab3bb0b190eec9 (patch) | |
| tree | 10216d47cc6b90b357afc516005a0482661074ed | |
| parent | a67b16e232f5ff624d4f600842ab56c752a0397a (diff) | |
tipc: clear 'next'-pointer of message fragments before reassembly
[ Upstream commit 999417549c16dd0e3a382aa9f6ae61688db03181 ]
If the 'next' pointer of the last fragment buffer in a message is not
zeroed before reassembly, we risk ending up with a corrupt message,
since the reassembly function itself isn't doing this.
Currently, when a buffer is retrieved from the deferred queue of the
broadcast link, the next pointer is not cleared, with the result as
described above.
This commit corrects this, and thereby fixes a bug that may occur when
long broadcast messages are transmitted across dual interfaces. The bug
has been present since 40ba3cdf542a469aaa9083fa041656e59b109b90 ("tipc:
message reassembly using fragment chain")
This commit should be applied to both net and net-next.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | net/tipc/bcast.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 716de1ac6cb..6ef89256b2f 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -531,6 +531,7 @@ receive: buf = node->bclink.deferred_head; node->bclink.deferred_head = buf->next; + buf->next = NULL; node->bclink.deferred_size--; goto receive; } |