samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Free NDI peers/vdev at time of ndi_delete/driver unload

Browse Source 
Sometime user may not delete active NDP sessions before deleting NDI or
may not delete NDI before driver unload. In such case vdev/peer object
memory will leak. Free all NDI peers for that vdev before processing NDI
delete and free all NDI peers/vdev at driver unload.

Change-Id: I04631ffd611d6ded318ddfb65b2dfeba479c9bdc
CRs-Fixed: 2262769
This commit is contained in:
Naveen Rawat
2018-06-20 19:48:17 -07:00
committed by nshrivas
parent 51f68ff7df
commit 1e8e057a77
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
os_if/linux/nan/src/os_if_nan.c
View File

@@ -33,6 +33,7 @@
#include "wlan_objmgr_psoc_obj.h"
#include "wlan_objmgr_pdev_obj.h"
#include "wlan_objmgr_vdev_obj.h"
#include "wlan_objmgr_peer_obj.h"
#include "wlan_utility.h"
/* NLA policy */
@@ -188,10 +189,20 @@ static int os_if_nan_process_ndi_create(struct wlan_objmgr_psoc *psoc,
return ret;
}
return cb_obj.ndi_start(iface_name, transaction_id);
}
static void os_if_nan_vdev_delete_peer(struct wlan_objmgr_psoc *psoc,
void *peer, void *nan_vdev)
{
/* if peer belongs to nan vdev */
if (nan_vdev == wlan_peer_get_vdev(peer)) {
cfg80211_debug("deleting peer: %pM",
wlan_peer_get_macaddr(peer));
wlan_objmgr_peer_obj_delete(peer);
}
}
static int os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc,
struct nlattr **tb)
{
@@ -225,6 +236,12 @@ static int os_if_nan_process_ndi_delete(struct wlan_objmgr_psoc *psoc,
nla_get_u16(tb[QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID]);
vdev_id = wlan_vdev_get_id(nan_vdev);
num_peers = ucfg_nan_get_active_peers(nan_vdev);
/* delete all peer for this interface first */
wlan_objmgr_iterate_obj_list(psoc, WLAN_PEER_OP,
os_if_nan_vdev_delete_peer,
nan_vdev, 1, WLAN_UMAC_COMP_NAN);
/*
* wlan_util_get_vdev_by_ifname increments ref count
* decrement here since vdev returned by that api is not used any more