| From 0879e2b6de0b1cd0eff4a59fd62c267a25cb439c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 11 Jun 2021 09:58:12 +0800 |
| Subject: ieee802154: hwsim: Fix possible memory leak in |
| hwsim_subscribe_all_others |
| |
| From: Dongliang Mu <mudongliangabcd@gmail.com> |
| |
| [ Upstream commit ab372c2293f5d0b279f31c8d768566ea37602dc9 ] |
| |
| In hwsim_subscribe_all_others, the error handling code performs |
| incorrectly if the second hwsim_alloc_edge fails. When this issue occurs, |
| it goes to sub_fail, without cleaning the edges allocated before. |
| |
| Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") |
| Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> |
| Acked-by: Alexander Aring <aahringo@redhat.com> |
| Link: https://lore.kernel.org/r/20210611015812.1626999-1-mudongliangabcd@gmail.com |
| Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ieee802154/mac802154_hwsim.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c |
| index c0bf7d78276e..7a168170224a 100644 |
| --- a/drivers/net/ieee802154/mac802154_hwsim.c |
| +++ b/drivers/net/ieee802154/mac802154_hwsim.c |
| @@ -715,6 +715,8 @@ static int hwsim_subscribe_all_others(struct hwsim_phy *phy) |
| |
| return 0; |
| |
| +sub_fail: |
| + hwsim_edge_unsubscribe_me(phy); |
| me_fail: |
| rcu_read_lock(); |
| list_for_each_entry_rcu(e, &phy->edges, list) { |
| @@ -722,8 +724,6 @@ me_fail: |
| hwsim_free_edge(e); |
| } |
| rcu_read_unlock(); |
| -sub_fail: |
| - hwsim_edge_unsubscribe_me(phy); |
| return -ENOMEM; |
| } |
| |
| -- |
| 2.30.2 |
| |
