linux-stable.git/net/tipc, branch linux-3.17.y

tipc: fix bug in bundled buffer reception

2014-11-14T18:10:20+00:00

[ Upstream commit 643566d4b47e2956110e79c0e6f65db9b9ea42c6 ]

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 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

tipc: Fix build.

2014-08-19T18:16:38+00:00

Missing semicolon in range check fix.

Signed-off-by: David S. Miller

tipc: fix message importance range check

2014-08-17T03:17:34+00:00

Commit 3b4f302d8578 ("tipc: eliminate
redundant locking") introduced a bug by removing the sanity check
for message importance, allowing programs to assign any value to
the msg_user field. This will mess up the packet reception logic
and may cause random link resets.

Signed-off-by: Erik Hugne 
Signed-off-by: David S. Miller

tipc: remove duplicated include from socket.c

2014-07-29T22:51:14+00:00

Remove duplicated include.

Signed-off-by: Wei Yongjun 
Signed-off-by: David S. Miller

tipc: make tipc_buf_append() more robust

2014-07-29T01:34:01+00:00

As per comment from David Miller, we try to make the buffer reassembly
function more resilient to user errors than it is today.

- We check that the "*buf" parameter always is set, since this is
  mandatory input.

- We ensure that *buf->next always is set to NULL before linking in
  the buffer, instead of relying of the caller to have done this.

- We ensure that the "tail" pointer in the head buffer's control
  block is initialized to NULL when the first fragment arrives.

Signed-off-by: Jon Maloy 
Signed-off-by: David S. Miller

tipc: fix sparse non static symbol warnings

2014-07-21T05:19:04+00:00

Fixes the following sparse warnings:

net/tipc/socket.c:545:5: warning:
 symbol 'tipc_sk_proto_rcv' was not declared. Should it be static?
net/tipc/socket.c:2015:5: warning:
 symbol 'tipc_ioctl' was not declared. Should it be static?

Signed-off-by: Wei Yongjun 
Acked-by: Ying Xue 
Signed-off-by: David S. Miller

tipc: ensure sequential message delivery across dual bearers

2014-07-17T04:38:19+00:00

When we run broadcast packets over dual bearers/interfaces, the
current transmission code is flipping bearers between each sent
packet, with the purpose of leveraging the double bandwidth
available. The receiving bclink is resequencing the packets if
needed, so all messages are delivered upwards from the broadcast
link in the correct order, even if they may arrive in concurrent
interrupts.

However, at the moment of delivery upwards to the socket, we release
all spinlocks (bclink_lock, node_lock), so it is still possible
that arriving messages bypass each other before they reach the socket
queue.

We fix this by applying the same technique we are using for unicast
traffic. We use a link selector (i.e., the last bit of sending port
number) to ensure that messages from the same sender socket always are
sent over the same bearer. This guarantees sequential delivery between
socket pairs, which is sufficient to satisfy the protocol spec, as well
as all known user requirements.

Signed-off-by: Jon Maloy 
Reviewed-by: Erik Hugne 
Reviewed-by: Ying Xue 
Signed-off-by: David S. Miller

tipc: rename temporarily named functions

2014-07-17T04:38:19+00:00

After the previous commit, we can now give the functions with temporary
names, such as tipc_link_xmit2(), tipc_msg_build2() etc., their proper
names.

There are no functional changes in this commit.

Signed-off-by: Jon Maloy 
Reviewed-by: Erik Hugne 
Reviewed-by: Ying Xue 
Signed-off-by: David S. Miller

tipc: remove unreferenced functions

2014-07-17T04:38:19+00:00

We can now remove a number of functions which have become obsolete
and unreferenced through this commit series. There are no functional
changes in this commit.

Signed-off-by: Jon Maloy 
Reviewed-by: Erik Hugne 
Reviewed-by: Ying Xue 
Signed-off-by: David S. Miller

tipc: start using the new multicast functions

2014-07-17T04:38:18+00:00

In this commit, we convert the socket multicast send function to
directly call the new multicast/broadcast function (tipc_bclink_xmit2())
introduced in the previous commit. We do this instead of letting the
call go via the now obsolete tipc_port_mcast_xmit(), hence saving
a call level and some code complexity.

We also remove the initial destination lookup at the message sending
side, and replace that with an unconditional lookup at the receiving
side, including on the sending node itself. This makes the destination
lookup and message transfer more uniform than before.

Signed-off-by: Jon Maloy 
Reviewed-by: Erik Hugne 
Reviewed-by: Ying Xue 
Signed-off-by: David S. Miller