diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-07-11 08:45:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-28 07:06:45 -0700 |
| commit | d1558f713d5a4963f1bf95573bc870b816651f91 (patch) | |
| tree | 18dd05b302501fe767bba05797514185397a726f | |
| parent | 3c656d481c5ed4285a955fcd3e8e8779d664a30e (diff) | |
| download | linux-stable-d1558f713d5a4963f1bf95573bc870b816651f91.tar.gz linux-stable-d1558f713d5a4963f1bf95573bc870b816651f91.tar.bz2 linux-stable-d1558f713d5a4963f1bf95573bc870b816651f91.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 e00441a2092f..9495be3a61e0 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -541,6 +541,7 @@ receive: buf = node->bclink.deferred_head; node->bclink.deferred_head = buf->next; + buf->next = NULL; node->bclink.deferred_size--; goto receive; } |