openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tipc: Fix memory leak in tipc_group_create_member() 

tipc_group_add_to_tree() returns silently if `key` matches `nkey` of an
existing node, causing tipc_group_create_member() to leak memory. Let
tipc_group_add_to_tree() return an error in such a case, so that
tipc_group_create_member() can handle it properly.

Fixes: 75da2163db ("tipc: introduce communication groups")
Reported-and-tested-by: syzbot+f95d90c454864b3b5bc9@syzkaller.appspotmail.com
Cc: Hillf Danton <hdanton@sina.com>
Link: https://syzkaller.appspot.com/bug?id=048390604fe1b60df34150265479202f10e13aff
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Peilin Ye 2020-09-13 04:06:05 -04:00 committed by David S. Miller
parent 1869e226a7
commit bb3a420d47
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/tipc/group.c
View File

@ -273,8 +273,8 @@ static struct tipc_member *tipc_group_find_node(struct tipc_group *grp,
return NULL; return NULL;
} }
static void tipc_group_add_to_tree(struct tipc_group *grp, static int tipc_group_add_to_tree(struct tipc_group *grp,
struct tipc_member *m) struct tipc_member *m)
{ {
u64 nkey, key = (u64)m->node << 32 | m->port; u64 nkey, key = (u64)m->node << 32 | m->port;
struct rb_node **n, *parent = NULL; struct rb_node **n, *parent = NULL;
@ -291,10 +291,11 @@ static void tipc_group_add_to_tree(struct tipc_group *grp,
else if (key > nkey) else if (key > nkey)
n = &(*n)->rb_right; n = &(*n)->rb_right;
else else
return; return -EEXIST;
} }
rb_link_node(&m->tree_node, parent, n); rb_link_node(&m->tree_node, parent, n);
rb_insert_color(&m->tree_node, &grp->members); rb_insert_color(&m->tree_node, &grp->members);
return 0;
} }
static struct tipc_member *tipc_group_create_member(struct tipc_group *grp, static struct tipc_member *tipc_group_create_member(struct tipc_group *grp,
@ -302,6 +303,7 @@ static struct tipc_member *tipc_group_create_member(struct tipc_group *grp,
u32 instance, int state) u32 instance, int state)
{ {
struct tipc_member *m; struct tipc_member *m;
int ret;
m = kzalloc(sizeof(*m), GFP_ATOMIC); m = kzalloc(sizeof(*m), GFP_ATOMIC);
if (!m) if (!m)
@ -314,8 +316,12 @@ static struct tipc_member *tipc_group_create_member(struct tipc_group *grp,
m->port = port; m->port = port;
m->instance = instance; m->instance = instance;
m->bc_acked = grp->bc_snd_nxt - 1; m->bc_acked = grp->bc_snd_nxt - 1;
ret = tipc_group_add_to_tree(grp, m);
if (ret < 0) {
kfree(m);
return NULL;
}
grp->member_cnt++; grp->member_cnt++;
tipc_group_add_to_tree(grp, m);
tipc_nlist_add(&grp->dests, m->node); tipc_nlist_add(&grp->dests, m->node);
m->state = state; m->state = state;
return m; return m;