From 80898349e8fcf52aed857a0bdb9f0b2608d32846 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Fri, 20 Oct 2017 11:37:43 -0700 Subject: [PATCH] qcacmn: Add NULL pointer check before dereferencing it Few of the serialization APIs are de-referencing the pointer without checking it against NULL. Add a NULL check before de-referencing it. CRs-Fixed: 2130161 Change-Id: I109518332e593e1f32936404021db1db7a332df7 --- umac/cmn_services/serialization/src/wlan_serialization_api.c | 4 ++++ .../serialization/src/wlan_serialization_utils.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/umac/cmn_services/serialization/src/wlan_serialization_api.c b/umac/cmn_services/serialization/src/wlan_serialization_api.c index 032e1a0a32..9b7d2d0209 100644 --- a/umac/cmn_services/serialization/src/wlan_serialization_api.c +++ b/umac/cmn_services/serialization/src/wlan_serialization_api.c @@ -219,6 +219,10 @@ wlan_serialization_request(struct wlan_serialization_command *cmd) } ser_soc_obj = wlan_serialization_get_obj(cmd); + if (!ser_soc_obj) { + serialization_err("ser_soc_obj is invalid"); + return WLAN_SER_CMD_DENIED_UNSPECIFIED; + } /* * Get Component Info callback by calling diff --git a/umac/cmn_services/serialization/src/wlan_serialization_utils.c b/umac/cmn_services/serialization/src/wlan_serialization_utils.c index 43167a065e..cd72a1a415 100644 --- a/umac/cmn_services/serialization/src/wlan_serialization_utils.c +++ b/umac/cmn_services/serialization/src/wlan_serialization_utils.c @@ -532,9 +532,12 @@ struct wlan_serialization_pdev_priv_obj *wlan_serialization_get_pdev_priv_obj( struct wlan_serialization_psoc_priv_obj * wlan_serialization_get_obj(struct wlan_serialization_command *cmd) { - struct wlan_serialization_psoc_priv_obj *ser_soc_obj; + struct wlan_serialization_psoc_priv_obj *ser_soc_obj = NULL; struct wlan_objmgr_psoc *psoc; + if (!cmd->vdev) + return ser_soc_obj; + psoc = wlan_vdev_get_psoc(cmd->vdev); ser_soc_obj = wlan_serialization_get_psoc_priv_obj(psoc);