aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-05-04 10:36:48 +0800
committerDavid S. Miller <davem@davemloft.net>2015-05-04 15:04:01 -0400
commit90bdfcb76f7d3b4a763ded3242277578ef22eda4 (patch)
tree0edc984430d6ccc5c417ccb8a3600cbe8b75e7ed /net/tipc
parenta13683f292b2ce697f71fa3788a9335ebcb32676 (diff)
tipc: deal with return value of tipc_conn_new callback
Once tipc_conn_new() returns NULL, the connection should be shut down immediately, otherwise, oops may happen due to the NULL pointer. Signed-off-by: Ying Xue <ying.xue@windriver.com> Reviewed-by: Jon Maloy <jon.maloy@ericson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/server.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c
index 77ff03ed1e18..a91a2f79209a 100644
--- a/net/tipc/server.c
+++ b/net/tipc/server.c
@@ -309,6 +309,10 @@ static int tipc_accept_from_sock(struct tipc_conn *con)
/* Notify that new connection is incoming */
newcon->usr_data = s->tipc_conn_new(newcon->conid);
+ if (!newcon->usr_data) {
+ sock_release(newsock);
+ return -ENOMEM;
+ }
/* Wake up receive process in case of 'SYN+' message */
newsock->sk->sk_data_ready(newsock->sk);

Privacy Policy