summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorJon Maloy <jon.maloy@ericsson.com>2018-01-10 21:08:50 +0100
committerDavid S. Miller <davem@davemloft.net>2018-01-15 19:43:51 +0100
commitfebafc8455fdbb0ba53d596075068a683b75f355 (patch)
treedd63648d661c0f053d2c5c1015fb6cce8e7e9969 /net/tipc
parentMerge branch 'dsa-lan9303-check-error-value-from-devm_gpiod_get_optional' (diff)
downloadlinux-febafc8455fdbb0ba53d596075068a683b75f355.tar.xz
linux-febafc8455fdbb0ba53d596075068a683b75f355.zip
tipc: fix a potental access after delete in tipc_sk_join()
In commit d12d2e12cec2 "tipc: send out join messages as soon as new member is discovered") we added a call to the function tipc_group_join() without considering the case that the preceding tipc_sk_publish() might have failed, and the group item already deleted. We fix this by returning from tipc_sk_join() directly after the failed tipc_sk_publish. Reported-by: syzbot+e3eeae78ea88b8d6d858@syzkaller.appspotmail.com Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1f236271766c..f38264db45ae 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2774,6 +2774,7 @@ static int tipc_sk_join(struct tipc_sock *tsk, struct tipc_group_req *mreq)
if (rc) {
tipc_group_delete(net, grp);
tsk->group = NULL;
+ return rc;
}
/* Eliminate any risk that a broadcast overtakes sent JOINs */
tsk->mc_method.rcast = true;