Linux-WPAN Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others
@ 2021-06-11  1:58 Dongliang Mu
  2021-06-12 12:38 ` Alexander Aring
  2021-06-12 12:49 ` Alexander Aring
  0 siblings, 2 replies; 4+ messages in thread
From: Dongliang Mu @ 2021-06-11  1:58 UTC (permalink / raw)
  To: alex.aring, stefan, davem, kuba
  Cc: linux-wpan, netdev, linux-kernel, Dongliang Mu

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>
---
 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 da9135231c07..366eaae3550a 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 @@ static int hwsim_subscribe_all_others(struct hwsim_phy *phy)
 		hwsim_free_edge(e);
 	}
 	rcu_read_unlock();
-sub_fail:
-	hwsim_edge_unsubscribe_me(phy);
 	return -ENOMEM;
 }
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others
  2021-06-11  1:58 [PATCH] ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others Dongliang Mu
@ 2021-06-12 12:38 ` Alexander Aring
  2021-06-12 12:49 ` Alexander Aring
  1 sibling, 0 replies; 4+ messages in thread
From: Alexander Aring @ 2021-06-12 12:38 UTC (permalink / raw)
  To: Dongliang Mu
  Cc: Stefan Schmidt, David S. Miller, Jakub Kicinski, linux-wpan - ML,
	open list:NETWORKING [GENERAL],
	kernel list

Hi,

On Thu, 10 Jun 2021 at 21:58, Dongliang Mu <mudongliangabcd@gmail.com> wrote:
>
> 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>
> ---
>  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 da9135231c07..366eaae3550a 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 @@ static int hwsim_subscribe_all_others(struct hwsim_phy *phy)
>                 hwsim_free_edge(e);
>         }
>         rcu_read_unlock();
> -sub_fail:

this goto needs to be removed and all goto cases need to end in
me_fail (better named to be fail only).
In an error case both loops need to be iterated again to cleanup.

- Alex

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others
  2021-06-11  1:58 [PATCH] ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others Dongliang Mu
  2021-06-12 12:38 ` Alexander Aring
@ 2021-06-12 12:49 ` Alexander Aring
  2021-06-14 11:06   ` Stefan Schmidt
  1 sibling, 1 reply; 4+ messages in thread
From: Alexander Aring @ 2021-06-12 12:49 UTC (permalink / raw)
  To: Dongliang Mu
  Cc: Stefan Schmidt, David S. Miller, Jakub Kicinski, linux-wpan - ML,
	open list:NETWORKING [GENERAL],
	kernel list

Hi,

On Thu, 10 Jun 2021 at 21:58, Dongliang Mu <mudongliangabcd@gmail.com> wrote:
>
> 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>

sorry, it is a correct fix. Thanks.

- Alex

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others
  2021-06-12 12:49 ` Alexander Aring
@ 2021-06-14 11:06   ` Stefan Schmidt
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Schmidt @ 2021-06-14 11:06 UTC (permalink / raw)
  To: Alexander Aring, Dongliang Mu
  Cc: David S. Miller, Jakub Kicinski, linux-wpan - ML,
	open list:NETWORKING [GENERAL],
	kernel list

Hello.

On 12.06.21 14:49, Alexander Aring wrote:
> Hi,
> 
> On Thu, 10 Jun 2021 at 21:58, Dongliang Mu <mudongliangabcd@gmail.com> wrote:
>>
>> 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>
> 
> sorry, it is a correct fix. Thanks.


This patch has been applied to the wpan tree and will be
part of the next pull request to net. Thanks!

regards
Stefan Schmidt

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-11  1:58 [PATCH] ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others Dongliang Mu
2021-06-12 12:38 ` Alexander Aring
2021-06-12 12:49 ` Alexander Aring
2021-06-14 11:06   ` Stefan Schmidt

Linux-WPAN Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-wpan/0 linux-wpan/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-wpan linux-wpan/ https://lore.kernel.org/linux-wpan \
		linux-wpan@vger.kernel.org
	public-inbox-index linux-wpan

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-wpan


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git