* [Linux-kernel-mentees] [PATCH] net: team: fix memory leak in __team_options_register
@ 2020-10-04 20:55 Anant Thazhemadam
2020-10-04 21:48 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Anant Thazhemadam @ 2020-10-04 20:55 UTC (permalink / raw)
Cc: Anant Thazhemadam, Jiri Pirko, syzbot+69b804437cfec30deac3,
netdev, linux-kernel, Jakub Kicinski, linux-kernel-mentees,
David S. Miller
The variable "i" isn't initialized back correctly after the first loop
under the label inst_rollback gets executed.
The value of "i" is assigned to be option_count - 1, and the ensuing
loop (under alloc_rollback) begins by initializing i--.
Thus, the value of i when the loop begins execution will now become
i = option_count - 2.
Thus, when kfree(dst_opts[i]) is called in the second loop in this
order, (i.e., inst_rollback followed by alloc_rollback),
dst_optsp[option_count - 2] is the first element freed, and
dst_opts[option_count - 1] does not get freed, and thus, a memory
leak is caused.
This memory leak can be fixed, by assigning i = option_count (instead of
option_count - 1).
Fixes: 80f7c6683fe0 ("team: add support for per-port options")
Reported-by: syzbot+69b804437cfec30deac3@syzkaller.appspotmail.com
Tested-by: syzbot+69b804437cfec30deac3@syzkaller.appspotmail.com
Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
---
drivers/net/team/team.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 8c1e02752ff6..8986f3ffffe4 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -287,7 +287,7 @@ static int __team_options_register(struct team *team,
for (i--; i >= 0; i--)
__team_option_inst_del_option(team, dst_opts[i]);
- i = option_count - 1;
+ i = option_count;
alloc_rollback:
for (i--; i >= 0; i--)
kfree(dst_opts[i]);
--
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] 2+ messages in thread
* Re: [Linux-kernel-mentees] [PATCH] net: team: fix memory leak in __team_options_register
2020-10-04 20:55 [Linux-kernel-mentees] [PATCH] net: team: fix memory leak in __team_options_register Anant Thazhemadam
@ 2020-10-04 21:48 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-10-04 21:48 UTC (permalink / raw)
To: anant.thazhemadam
Cc: jiri, syzbot+69b804437cfec30deac3, netdev, linux-kernel, kuba,
linux-kernel-mentees
From: Anant Thazhemadam <anant.thazhemadam@gmail.com>
Date: Mon, 5 Oct 2020 02:25:36 +0530
> The variable "i" isn't initialized back correctly after the first loop
> under the label inst_rollback gets executed.
>
> The value of "i" is assigned to be option_count - 1, and the ensuing
> loop (under alloc_rollback) begins by initializing i--.
> Thus, the value of i when the loop begins execution will now become
> i = option_count - 2.
>
> Thus, when kfree(dst_opts[i]) is called in the second loop in this
> order, (i.e., inst_rollback followed by alloc_rollback),
> dst_optsp[option_count - 2] is the first element freed, and
> dst_opts[option_count - 1] does not get freed, and thus, a memory
> leak is caused.
>
> This memory leak can be fixed, by assigning i = option_count (instead of
> option_count - 1).
>
> Fixes: 80f7c6683fe0 ("team: add support for per-port options")
> Reported-by: syzbot+69b804437cfec30deac3@syzkaller.appspotmail.com
> Tested-by: syzbot+69b804437cfec30deac3@syzkaller.appspotmail.com
> Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
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] 2+ messages in thread
end of thread, other threads:[~2020-10-04 21:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-04 20:55 [Linux-kernel-mentees] [PATCH] net: team: fix memory leak in __team_options_register Anant Thazhemadam
2020-10-04 21:48 ` 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).