summaryrefslogtreecommitdiffstats
path: root/net/tipc/socket.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-20 20:40:31 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-20 20:40:31 -0400
commit167de77fd4e5646f98f67bd9f0a0054a891f6ff4 (patch)
treeabe31d384dbe9c7bad0da839600423d1eda4b6e2 /net/tipc/socket.c
parent2528a5dc4331aebbb990f2a56d179dfa35de4a4f (diff)
parent9d52ce4bd3fa9e0cf1658791f2c680e20e0598a1 (diff)
Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r--net/tipc/socket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index bcb3314ef16..c19fc4a228a 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1236,7 +1236,8 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
if (msg_mcast(msg))
return TIPC_ERR_NO_PORT;
if (sock->state == SS_CONNECTED) {
- if (!msg_connected(msg))
+ if (!msg_connected(msg) ||
+ !tipc_port_peer_msg(tipc_sk_port(sk), msg))
return TIPC_ERR_NO_PORT;
} else if (sock->state == SS_CONNECTING) {
if (!msg_connected(msg) && (msg_errcode(msg) == 0))