Unverified Commit adac2fbc authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10311 wifi: mac80211: mesh: Fix leak of mesh_preq_queue objects 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yue Haibing <yuehaibing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JVBKPHXJ2UNWQPGVLN2JG3DDX46JPHPP/ 
 
https://gitee.com/openeuler/kernel/issues/IAD6H2 
 
Link:https://gitee.com/openeuler/kernel/pulls/10311

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 2857df6a 5c070088

net/mac80211/mesh_pathtbl.c

+13 −0
Original line number Diff line number Diff line
@@ -1011,10 +1011,23 @@ void mesh_path_discard_frame(struct ieee80211_sub_if_data *sdata, 
 */

void mesh_path_flush_pending(struct mesh_path *mpath)

{

	struct ieee80211_sub_if_data *sdata = mpath->sdata;

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	struct mesh_preq_queue *preq, *tmp;

	struct sk_buff *skb;



	while ((skb = skb_dequeue(&mpath->frame_queue)) != NULL)

		mesh_path_discard_frame(mpath->sdata, skb);



	spin_lock_bh(&ifmsh->mesh_preq_queue_lock);

	list_for_each_entry_safe(preq, tmp, &ifmsh->preq_queue.list, list) {

		if (ether_addr_equal(mpath->dst, preq->dst)) {

			list_del(&preq->list);

			kfree(preq);

			--ifmsh->preq_queue_len;

		}

	}

	spin_unlock_bh(&ifmsh->mesh_preq_queue_lock);

}



/**