From 1d2f3d2a2543caea80cc7435a02a7593ce354da0 Mon Sep 17 00:00:00 2001 From: Om Prakash Tripathi Date: Wed, 27 Dec 2017 14:48:19 +0530 Subject: [PATCH] qcacmn: Ensure vdev is valid before accessing it Ensure vdev is valid before accessing it. Change-Id: I27fc2d2964829d9609c1b489a95a712e07b2e0be CRs-Fixed: 2164427 --- umac/scan/core/src/wlan_scan_manager.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/umac/scan/core/src/wlan_scan_manager.c b/umac/scan/core/src/wlan_scan_manager.c index abd5346131ca..e2ea87fedd8f 100644 --- a/umac/scan/core/src/wlan_scan_manager.c +++ b/umac/scan/core/src/wlan_scan_manager.c @@ -302,12 +302,19 @@ scm_scan_serialize_callback(struct wlan_serialization_command *cmd, if (!cmd || !cmd->umac_cmd) { scm_err("cmd: %pK, umac_cmd: %pK, reason: %d", cmd, cmd->umac_cmd, reason); + QDF_ASSERT(0); return QDF_STATUS_E_NULL_VALUE; } req = cmd->umac_cmd; - scm_info("reason: %d, reqid:%d, scanid: %d, vdev_id: %d", - reason, req->scan_req.scan_req_id, - req->scan_req.scan_id, req->scan_req.vdev_id); + scm_debug("reason:%d, reqid:%d, scanid:%d, vdevid:%d, vdev:0x%pK", + reason, req->scan_req.scan_req_id, req->scan_req.scan_id, + req->scan_req.vdev_id, req->vdev); + + if (!req->vdev) { + scm_err("NULL vdev. req:0x%pK, reason:%d\n", req, reason); + QDF_ASSERT(0); + return QDF_STATUS_E_NULL_VALUE; + } switch (reason) { case WLAN_SER_CB_ACTIVATE_CMD: