tipc: fix two bugs in secondary destination lookup

A message sent to a node after a successful name table lookup may still
find that the destination socket has disappeared, because distribution
of name table updates is non-atomic. If so, the message will be rejected
back to the sender with error code TIPC_ERR_NO_PORT. If the source
socket of the message has disappeared in the meantime, the message
should be dropped.

However, in the currrent code, the message will instead be subject to an
unwanted tertiary lookup, because the function tipc_msg_lookup_dest()
doesn't check if there is an error code present in the message before
performing the lookup. In the worst case, the message may now find the
old destination again, and be redirected once more, instead of being
dropped directly as it should be.

A second bug in this function is that the "prev_node" field in the message
is not updated after successful lookup, something that may have
unpredictable consequences.

The problems arising from those bugs occur very infrequently.

The third change in this function; the test on msg_reroute_msg_cnt() is
purely cosmetic, reflecting that the returned value never can be negative.

This commit corrects the two bugs described above.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/addr.c b/net/tipc/addr.c
index 48fd3b5a73fbaf934178c444cbba07aa1a0f5b8c..ba7daa864d44471ad6c57d630bcaa4379aabea0c 100644 (file)
--- a/net/tipc/addr.c
+++ b/net/tipc/addr.c
@@ -38,6 +38,13 @@
 #include "addr.h"
 #include "core.h"
 
+u32 tipc_own_addr(struct net *net)
+{
+       struct tipc_net *tn = net_generic(net, tipc_net_id);
+
+       return tn->own_addr;
+}
+
 /**
  * in_own_cluster - test for cluster inclusion; <0.0.0> always matches
  */

diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index c700c2d28e09eb6921bb2a211f1cba50b8d08b82..7ba6d5c8ae405727721ba8ace46c7051938163ef 100644 (file)
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@@ -55,6 +55,7 @@ static inline u32 tipc_cluster_mask(u32 addr)
        return addr & TIPC_CLUSTER_MASK;
 }
 
+u32 tipc_own_addr(struct net *net);
 int in_own_cluster(struct net *net, u32 addr);
 int in_own_cluster_exact(struct net *net, u32 addr);
 int in_own_node(struct net *net, u32 addr);

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 0c6dad8180a0f5acd42750b77c3472eabfd50790..3bb499c619181b7275e9839b4d718543f5a87e6a 100644 (file)
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -511,15 +511,18 @@ bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb,
 {
        struct tipc_msg *msg = buf_msg(skb);
        u32 dport;
+       u32 own_addr = tipc_own_addr(net);
 
        if (!msg_isdata(msg))
                return false;
        if (!msg_named(msg))
                return false;
+       if (msg_errcode(msg))
+               return false;
        *err = -TIPC_ERR_NO_NAME;
        if (skb_linearize(skb))
                return false;
-       if (msg_reroute_cnt(msg) > 0)
+       if (msg_reroute_cnt(msg))
                return false;
        *dnode = addr_domain(net, msg_lookup_scope(msg));
        dport = tipc_nametbl_translate(net, msg_nametype(msg),
@@ -527,6 +530,8 @@ bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb,
        if (!dport)
                return false;
        msg_incr_reroute_cnt(msg);
+       if (*dnode != own_addr)
+               msg_set_prevnode(msg, own_addr);
        msg_set_destnode(msg, *dnode);
        msg_set_destport(msg, dport);
        *err = TIPC_OK;