From 9527e111d0d5ce87d450dcd06d2937da5378de3a Mon Sep 17 00:00:00 2001 From: Srinivas Pitla Date: Thu, 28 Feb 2019 15:51:49 +0530 Subject: [PATCH] qcacmn: avoid access sm before NULL check This change moves accessing sm after NULL check performed Change-Id: Iad1c0d9ea9c8bb6e79338259ab93f685b78ad26f CRs-Fixed: 2407091 --- umac/cmn_services/sm_engine/src/wlan_sm_engine.c | 3 ++- umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/umac/cmn_services/sm_engine/src/wlan_sm_engine.c b/umac/cmn_services/sm_engine/src/wlan_sm_engine.c index 9c74847b2e..26e22f1e08 100644 --- a/umac/cmn_services/sm_engine/src/wlan_sm_engine.c +++ b/umac/cmn_services/sm_engine/src/wlan_sm_engine.c @@ -79,7 +79,7 @@ qdf_export_symbol(wlan_sm_dispatch); void wlan_sm_transition_to(struct wlan_sm *sm, uint8_t state) { - const struct wlan_sm_state_info *state_info = sm->state_info; + struct wlan_sm_state_info *state_info; uint8_t new_state; uint8_t old_state; uint8_t new_sub_st; @@ -91,6 +91,7 @@ void wlan_sm_transition_to(struct wlan_sm *sm, uint8_t state) return; } + state_info = sm->state_info; cur_state = sm->cur_state; /* cannot change state from state entry/exit routines */ diff --git a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h index 7fcb8fe8f6..2db278a634 100644 --- a/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h +++ b/umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.h @@ -54,7 +54,7 @@ void mlme_vdev_sm_print_state_event(struct vdev_mlme_obj *vdev_mlme, enum wlan_vdev_sm_evt event); /** - * mlme_vdev_sm_print_state_event() - Prints the state/substate + * mlme_vdev_sm_print_state() - Prints the state/substate * @vdev_mlme: MLME VDEV comp object * * API to print current state/substate