]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ieee802154: hwsim: Fix possible memory leak in hwsim_subscribe_all_others
authorDongliang Mu <mudongliangabcd@gmail.com>
Fri, 11 Jun 2021 01:58:12 +0000 (09:58 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:15:49 +0000 (16:15 +0200)
[ 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

index be1f1a86bcd61d2bbbe21376e6caeff3c1d64076..c66a010650e02a4f6c8e7d5e8d6e809165e54448 100644 (file)
@@ -734,6 +734,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) {
@@ -741,8 +743,6 @@ me_fail:
                hwsim_free_edge(e);
        }
        rcu_read_unlock();
-sub_fail:
-       hwsim_edge_unsubscribe_me(phy);
        return -ENOMEM;
 }