---

yaml --- r: 187980 b: refs/heads/master c: de58657 h: refs/heads/master v: v3
git-mirror · Mar 8, 2010 · b12eda5 · b12eda5
1 parent b96e0d2
commit b12eda5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d88dca79d3852a3623f606f781e013d61486828a
+refs/heads/master: de5865714621e23d65c52955ca2125dbb074c242
diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c
@@ -1882,6 +1882,15 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr)
 			     (msg_destnode(msg) != tipc_own_addr)))
 			goto cont;
 
+		/* Discard non-routeable messages destined for another node */
+
+		if (unlikely(!msg_isdata(msg) &&
+			     (msg_destnode(msg) != tipc_own_addr))) {
+			if ((msg_user(msg) != CONN_MANAGER) &&
+			    (msg_user(msg) != MSG_FRAGMENTER))
+				goto cont;
+		}
+
 		/* Locate unicast link endpoint that should handle message */
 
 		n_ptr = tipc_node_find(msg_prevnode(msg));