From fa4e43888be63209dfeb0ca245ba322f0b0265b4 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Sirasanagandla Date: Thu, 13 Jun 2019 14:14:43 +0530 Subject: [PATCH] qcacld-3.0: Add NULL check for nan private objects In ndi_remove_and_update_primary_connection() of NAN component, add missing NULL checks for psoc and vdev NAN private objects to avoid possible NULL dereference. Change-Id: Iff3e248259ab67628d081d30f16d1822a0ea6dcb CRs-Fixed: 2423991 --- components/nan/core/src/nan_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/components/nan/core/src/nan_main.c b/components/nan/core/src/nan_main.c index adea1780144a..ae6bb20acd04 100644 --- a/components/nan/core/src/nan_main.c +++ b/components/nan/core/src/nan_main.c @@ -403,7 +403,16 @@ ndi_remove_and_update_primary_connection(struct wlan_objmgr_psoc *psoc, qdf_list_t *peer_list; psoc_nan_obj = nan_get_psoc_priv_obj(psoc); + if (!psoc_nan_obj) { + nan_err("Invalid psoc nan private obj"); + return QDF_STATUS_E_NULL_VALUE; + } + vdev_nan_obj = nan_get_vdev_priv_obj(vdev); + if (!vdev_nan_obj) { + nan_err("Invalid vdev nan private obj"); + return QDF_STATUS_E_NULL_VALUE; + } peer_list = &vdev->vdev_objmgr.wlan_peer_list; if (!peer_list) {