3 files changed, 14 insertions, 1 deletions

diff --git a/net/tipc/addr.c b/net/tipc/addr.c
index 48fd3b5a73fb..ba7daa864d44 100644
--- 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 c700c2d28e09..7ba6d5c8ae40 100644
--- 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 0c6dad8180a0..3bb499c61918 100644
--- 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;