qcacld-3.0: Remove logging of peer info after peer delete
Currently after dp peer delete peer info is logged which leads to invalid pointer access. Do not log the peer info after it is deleted. Change-Id: If4c2d9af7e3f2b29e3e034eec08fa68fd329257b CRs-Fixed: 2259026
这个提交包含在:
@@ -1421,6 +1421,11 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!peer) {
|
||||||
|
WMA_LOGE("%s: PEER is NULL for vdev_id: %d", __func__, vdev_id);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
peer_mac_addr = cdp_peer_get_peer_mac_addr(soc, peer);
|
peer_mac_addr = cdp_peer_get_peer_mac_addr(soc, peer);
|
||||||
if (peer_mac_addr == NULL) {
|
if (peer_mac_addr == NULL) {
|
||||||
WMA_LOGE("%s: peer mac addr is NULL, Can't remove peer with peer_addr %pM vdevid %d peer_count %d",
|
WMA_LOGE("%s: peer mac addr is NULL, Can't remove peer with peer_addr %pM vdevid %d peer_count %d",
|
||||||
@@ -1464,20 +1469,14 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid,
|
|||||||
}
|
}
|
||||||
|
|
||||||
peer_detach:
|
peer_detach:
|
||||||
WMA_LOGE("%s: Remove peer %pK with peer_addr %pM vdevid %d peer_count %d",
|
|
||||||
__func__, peer, bssid, vdev_id,
|
|
||||||
wma->interfaces[vdev_id].peer_count);
|
|
||||||
vdev = cdp_get_vdev_from_vdev_id(soc, pdev, vdev_id);
|
vdev = cdp_get_vdev_from_vdev_id(soc, pdev, vdev_id);
|
||||||
if (peer) {
|
WMA_LOGD("%s: vdev %pK is detaching %pK with peer_addr %pM vdevid %d peer_count %d",
|
||||||
if (roam_synch_in_progress) {
|
__func__, vdev, peer, peer_mac_addr, vdev_id,
|
||||||
cdp_peer_detach_force_delete(soc, peer);
|
wma->interfaces[vdev_id].peer_count);
|
||||||
} else {
|
if (roam_synch_in_progress)
|
||||||
cdp_peer_delete(soc, peer, bitmap);
|
cdp_peer_detach_force_delete(soc, peer);
|
||||||
WMA_LOGD("%s: vdev %p has detached peer:%p peer_addr %pM to vdev_id %d, peer_count - %d",
|
else
|
||||||
__func__, vdev, peer, peer_mac_addr, vdev_id,
|
cdp_peer_delete(soc, peer, bitmap);
|
||||||
wma->interfaces[vdev_id].peer_count);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
wma->interfaces[vdev_id].peer_count--;
|
wma->interfaces[vdev_id].peer_count--;
|
||||||
#undef PEER_ALL_TID_BITMASK
|
#undef PEER_ALL_TID_BITMASK
|
||||||
@@ -1586,7 +1585,7 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, struct cdp_pdev *pdev,
|
|||||||
WMA_LOGE("%s : Unable to attach peer %pM", __func__, peer_addr);
|
WMA_LOGE("%s : Unable to attach peer %pM", __func__, peer_addr);
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
WMA_LOGD("%s: vdev %p has attached peer:%p peer_addr %pM to vdev_id %d, peer_count - %d",
|
WMA_LOGD("%s: vdev %pK is attaching peer:%pK peer_addr %pM to vdev_id %d, peer_count - %d",
|
||||||
__func__, vdev, peer, peer_addr, vdev_id,
|
__func__, vdev, peer, peer_addr, vdev_id,
|
||||||
wma->interfaces[vdev_id].peer_count);
|
wma->interfaces[vdev_id].peer_count);
|
||||||
|
|
||||||
@@ -1602,11 +1601,11 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, struct cdp_pdev *pdev,
|
|||||||
if (wmi_unified_peer_create_send(wma->wmi_handle,
|
if (wmi_unified_peer_create_send(wma->wmi_handle,
|
||||||
¶m) != QDF_STATUS_SUCCESS) {
|
¶m) != QDF_STATUS_SUCCESS) {
|
||||||
WMA_LOGE("%s : Unable to create peer in Target", __func__);
|
WMA_LOGE("%s : Unable to create peer in Target", __func__);
|
||||||
cdp_peer_delete(dp_soc, peer,
|
WMA_LOGE("%s: vdev %pK is detaching peer:%pK peer_addr %pM to vdev_id %d, peer_count - %d",
|
||||||
1 << CDP_PEER_DO_NOT_START_UNMAP_TIMER);
|
|
||||||
WMA_LOGD("%s: vdev %p has detached peer:%p peer_addr %pM to vdev_id %d, peer_count - %d",
|
|
||||||
__func__, vdev, peer, peer_addr, vdev_id,
|
__func__, vdev, peer, peer_addr, vdev_id,
|
||||||
wma->interfaces[vdev_id].peer_count);
|
wma->interfaces[vdev_id].peer_count);
|
||||||
|
cdp_peer_delete(dp_soc, peer,
|
||||||
|
1 << CDP_PEER_DO_NOT_START_UNMAP_TIMER);
|
||||||
goto err;
|
goto err;
|
||||||
} else {
|
} else {
|
||||||
qdf_atomic_inc(&wma->interfaces[vdev_id].fw_peer_count);
|
qdf_atomic_inc(&wma->interfaces[vdev_id].fw_peer_count);
|
||||||
@@ -5510,12 +5509,13 @@ void wma_delete_bss_ho_fail(tp_wma_handle wma, tpDeleteBssParams params)
|
|||||||
goto fail_del_bss_ho_fail;
|
goto fail_del_bss_ho_fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (peer)
|
if (peer) {
|
||||||
|
WMA_LOGD("%s: vdev %pK is detaching peer:%pK peer_addr %pM to vdev_id %d, peer_count - %d",
|
||||||
|
__func__, txrx_vdev, peer, params->bssid,
|
||||||
|
params->smesessionId, iface->peer_count);
|
||||||
cdp_peer_delete(soc, peer, 1 << CDP_PEER_DELETE_NO_SPECIAL);
|
cdp_peer_delete(soc, peer, 1 << CDP_PEER_DELETE_NO_SPECIAL);
|
||||||
|
}
|
||||||
iface->peer_count--;
|
iface->peer_count--;
|
||||||
WMA_LOGD("%s: vdev %p has detached peer:%p peer_addr %pM to vdev_id %d, peer_count - %d",
|
|
||||||
__func__, txrx_vdev, peer, params->bssid, params->smesessionId,
|
|
||||||
iface->peer_count);
|
|
||||||
WMA_LOGI("%s: Removed peer %pK with peer_addr %pM vdevid %d peer_count %d",
|
WMA_LOGI("%s: Removed peer %pK with peer_addr %pM vdevid %d peer_count %d",
|
||||||
__func__, peer, params->bssid, params->smesessionId,
|
__func__, peer, params->bssid, params->smesessionId,
|
||||||
iface->peer_count);
|
iface->peer_count);
|
||||||
|
在新工单中引用
屏蔽一个用户