* [Linux-kernel-mentees] [PATCH net] tipc: Fix memory leak in tipc_group_create_member()
[not found] <000000000000879057058f193fb5@google.com>
@ 2020-09-12 10:22 ` Peilin Ye
2020-09-13 1:23 ` David Miller
2020-09-13 8:06 ` [Linux-kernel-mentees] [PATCH net v2] " Peilin Ye
0 siblings, 2 replies; 5+ messages in thread
From: Peilin Ye @ 2020-09-12 10:22 UTC (permalink / raw)
To: Jon Maloy, Ying Xue
Cc: Hillf Danton, netdev, syzkaller-bugs, linux-kernel,
David S. Miller, tipc-discussion, Jakub Kicinski,
linux-kernel-mentees, Peilin Ye
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: 75da2163dbb6 ("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>
---
Decoded syzbot reproducer in pseudo-C:
fd0 = socket(AF_TIPC, SOCK_DGRAM, 0);
sockaddr_tipc.family = AF_TIPC;
sockaddr_tipc.addrtype = TIPC_ADDR_NAMESEQ;
sockaddr_tipc.scope = 0;
sockaddr_tipc.addr.namesq.type = TIPC_RESERVED_TYPES + 1;
bind(fd0, &sockaddr_tipc, sizeof(sockaddr_tipc));
tipc_group_req0.type = TIPC_RESERVED_TYPES + 1;
setsockopt(fd0, SOL_TIPC, TIPC_GROUP_JOIN, &tipc_group_req0, sizeof(tipc_group_req0));
fd1 = socket(AF_TIPC, SOCK_STREAM, 0);
tipc_group_req1.type = TIPC_RESERVED_TYPES + 1;
tipc_group_req1.scope = TIPC_CLUSTER_SCOPE;
setsockopt(fd1, SOL_TIPC, TIPC_GROUP_JOIN, &tipc_group_req1, sizeof(tipc_group_req1));
net/tipc/group.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/net/tipc/group.c b/net/tipc/group.c
index 588c2d2b0c69..553cf08b4d76 100644
--- a/net/tipc/group.c
+++ b/net/tipc/group.c
@@ -273,8 +273,8 @@ static struct tipc_member *tipc_group_find_node(struct tipc_group *grp,
return NULL;
}
-static void tipc_group_add_to_tree(struct tipc_group *grp,
- struct tipc_member *m)
+static int tipc_group_add_to_tree(struct tipc_group *grp,
+ struct tipc_member *m)
{
u64 nkey, key = (u64)m->node << 32 | m->port;
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)
n = &(*n)->rb_right;
else
- return;
+ return -1;
}
rb_link_node(&m->tree_node, parent, n);
rb_insert_color(&m->tree_node, &grp->members);
+ return 0;
}
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)
{
struct tipc_member *m;
+ int ret;
m = kzalloc(sizeof(*m), GFP_ATOMIC);
if (!m)
@@ -314,8 +316,12 @@ static struct tipc_member *tipc_group_create_member(struct tipc_group *grp,
m->port = port;
m->instance = instance;
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++;
- tipc_group_add_to_tree(grp, m);
tipc_nlist_add(&grp->dests, m->node);
m->state = state;
return m;
--
2.25.1
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Linux-kernel-mentees] [PATCH net] tipc: Fix memory leak in tipc_group_create_member()
2020-09-12 10:22 ` [Linux-kernel-mentees] [PATCH net] tipc: Fix memory leak in tipc_group_create_member() Peilin Ye
@ 2020-09-13 1:23 ` David Miller
2020-09-13 7:49 ` Peilin Ye
2020-09-13 8:06 ` [Linux-kernel-mentees] [PATCH net v2] " Peilin Ye
1 sibling, 1 reply; 5+ messages in thread
From: David Miller @ 2020-09-13 1:23 UTC (permalink / raw)
To: yepeilin.cs
Cc: hdanton, netdev, syzkaller-bugs, linux-kernel, jmaloy,
tipc-discussion, ying.xue, kuba, linux-kernel-mentees
From: Peilin Ye <yepeilin.cs@gmail.com>
Date: Sat, 12 Sep 2020 06:22:30 -0400
> @@ -291,10 +291,11 @@ static void tipc_group_add_to_tree(struct tipc_group *grp,
> else if (key > nkey)
> n = &(*n)->rb_right;
> else
> - return;
> + return -1;
Use a real error code like "-EEXIST", thank you.
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Linux-kernel-mentees] [PATCH net] tipc: Fix memory leak in tipc_group_create_member()
2020-09-13 1:23 ` David Miller
@ 2020-09-13 7:49 ` Peilin Ye
0 siblings, 0 replies; 5+ messages in thread
From: Peilin Ye @ 2020-09-13 7:49 UTC (permalink / raw)
To: David Miller
Cc: hdanton, netdev, syzkaller-bugs, linux-kernel, jmaloy,
tipc-discussion, ying.xue, kuba, linux-kernel-mentees
On Sat, Sep 12, 2020 at 06:23:36PM -0700, David Miller wrote:
> From: Peilin Ye <yepeilin.cs@gmail.com>
> Date: Sat, 12 Sep 2020 06:22:30 -0400
>
> > @@ -291,10 +291,11 @@ static void tipc_group_add_to_tree(struct tipc_group *grp,
> > else if (key > nkey)
> > n = &(*n)->rb_right;
> > else
> > - return;
> > + return -1;
>
> Use a real error code like "-EEXIST", thank you.
Ah, I'll fix it in v2 soon, sorry about that. I saw another function in
this file returning -1.
Peilin Ye
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Linux-kernel-mentees] [PATCH net v2] tipc: Fix memory leak in tipc_group_create_member()
2020-09-12 10:22 ` [Linux-kernel-mentees] [PATCH net] tipc: Fix memory leak in tipc_group_create_member() Peilin Ye
2020-09-13 1:23 ` David Miller
@ 2020-09-13 8:06 ` Peilin Ye
2020-09-14 23:37 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Peilin Ye @ 2020-09-13 8:06 UTC (permalink / raw)
To: Jon Maloy, Ying Xue
Cc: Hillf Danton, netdev, syzkaller-bugs, linux-kernel,
David S. Miller, tipc-discussion, Jakub Kicinski,
linux-kernel-mentees, Peilin Ye
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: 75da2163dbb6 ("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>
---
Change in v2:
- let tipc_group_add_to_tree() return a real error code instead of -1.
(Suggested by David Miller <davem@davemloft.net>)
net/tipc/group.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/net/tipc/group.c b/net/tipc/group.c
index 588c2d2b0c69..b1fcd2ad5ecf 100644
--- a/net/tipc/group.c
+++ b/net/tipc/group.c
@@ -273,8 +273,8 @@ static struct tipc_member *tipc_group_find_node(struct tipc_group *grp,
return NULL;
}
-static void tipc_group_add_to_tree(struct tipc_group *grp,
- struct tipc_member *m)
+static int tipc_group_add_to_tree(struct tipc_group *grp,
+ struct tipc_member *m)
{
u64 nkey, key = (u64)m->node << 32 | m->port;
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)
n = &(*n)->rb_right;
else
- return;
+ return -EEXIST;
}
rb_link_node(&m->tree_node, parent, n);
rb_insert_color(&m->tree_node, &grp->members);
+ return 0;
}
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)
{
struct tipc_member *m;
+ int ret;
m = kzalloc(sizeof(*m), GFP_ATOMIC);
if (!m)
@@ -314,8 +316,12 @@ static struct tipc_member *tipc_group_create_member(struct tipc_group *grp,
m->port = port;
m->instance = instance;
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++;
- tipc_group_add_to_tree(grp, m);
tipc_nlist_add(&grp->dests, m->node);
m->state = state;
return m;
--
2.25.1
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Linux-kernel-mentees] [PATCH net v2] tipc: Fix memory leak in tipc_group_create_member()
2020-09-13 8:06 ` [Linux-kernel-mentees] [PATCH net v2] " Peilin Ye
@ 2020-09-14 23:37 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2020-09-14 23:37 UTC (permalink / raw)
To: yepeilin.cs
Cc: hdanton, netdev, syzkaller-bugs, linux-kernel, jmaloy,
tipc-discussion, ying.xue, kuba, linux-kernel-mentees
From: Peilin Ye <yepeilin.cs@gmail.com>
Date: Sun, 13 Sep 2020 04:06:05 -0400
> 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: 75da2163dbb6 ("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>
> ---
> Change in v2:
> - let tipc_group_add_to_tree() return a real error code instead of -1.
> (Suggested by David Miller <davem@davemloft.net>)
Applied and queued up for -stable, thank you.
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-14 23:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <000000000000879057058f193fb5@google.com>
2020-09-12 10:22 ` [Linux-kernel-mentees] [PATCH net] tipc: Fix memory leak in tipc_group_create_member() Peilin Ye
2020-09-13 1:23 ` David Miller
2020-09-13 7:49 ` Peilin Ye
2020-09-13 8:06 ` [Linux-kernel-mentees] [PATCH net v2] " Peilin Ye
2020-09-14 23:37 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).