diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-10-17 15:25:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-17 23:50:53 -0400 |
| commit | 643566d4b47e2956110e79c0e6f65db9b9ea42c6 (patch) | |
| tree | 38c2d7717a60e32c7e814d49877500ab8c3ed3b3 /net/tipc/link.c | |
| parent | 870c3151382c980590d4d609babf3b0243e7db93 (diff) | |
| download | op-kernel-dev-643566d4b47e2956110e79c0e6f65db9b9ea42c6.zip op-kernel-dev-643566d4b47e2956110e79c0e6f65db9b9ea42c6.tar.gz | |
tipc: fix bug in bundled buffer reception
In commit ec8a2e5621db2da24badb3969eda7fd359e1869f ("tipc: same receive
code path for connection protocol and data messages") we omitted the
the possiblilty that an arriving message extracted from a bundle buffer
may be a multicast message. Such messages need to be to be delivered to
the socket via a separate function, tipc_sk_mcast_rcv(). As a result,
small multicast messages arriving as members of a bundle buffer will be
silently dropped.
This commit corrects the error by considering this case in the function
tipc_link_bundle_rcv().
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 65410e1..1db162a 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -1924,7 +1924,12 @@ void tipc_link_bundle_rcv(struct sk_buff *buf) } omsg = buf_msg(obuf); pos += align(msg_size(omsg)); - if (msg_isdata(omsg) || (msg_user(omsg) == CONN_MANAGER)) { + if (msg_isdata(omsg)) { + if (unlikely(msg_type(omsg) == TIPC_MCAST_MSG)) + tipc_sk_mcast_rcv(obuf); + else + tipc_sk_rcv(obuf); + } else if (msg_user(omsg) == CONN_MANAGER) { tipc_sk_rcv(obuf); } else if (msg_user(omsg) == NAME_DISTRIBUTOR) { tipc_named_rcv(obuf); |
