From 4f0eae1817e2ae1d6ab4e2d8b0d9e1ce17e219da Mon Sep 17 00:00:00 2001 From: jiad Date: Mon, 21 May 2018 20:49:24 +0800 Subject: [PATCH] qcacld-3.0: Fix WLAN IPA NULL pointer dereference When ipa_check_hw_present() returns false, g_ipa_config is left as NULL pointer. ipa_config_is_enabled() and ipa_config_is_uc_enabled() will lead to NULL pointer dereference. Fix is to check against g_ipa_config NULL pointer in ipa_config_is_enabled() and ipa_config_is_uc_enabled(). Change-Id: I95da7aede7d72db8591102eea7504cad59686105 CRs-Fixed: 2246224 --- components/ipa/core/src/wlan_ipa_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/ipa/core/src/wlan_ipa_main.c b/components/ipa/core/src/wlan_ipa_main.c index a035cda35846..0a12a3331ced 100644 --- a/components/ipa/core/src/wlan_ipa_main.c +++ b/components/ipa/core/src/wlan_ipa_main.c @@ -81,12 +81,12 @@ void ipa_config_update(struct wlan_ipa_config *config) bool ipa_config_is_enabled(void) { - return wlan_ipa_is_enabled(g_ipa_config); + return g_ipa_config ? wlan_ipa_is_enabled(g_ipa_config) : 0; } bool ipa_config_is_uc_enabled(void) { - return wlan_ipa_uc_is_enabled(g_ipa_config); + return g_ipa_config ? wlan_ipa_uc_is_enabled(g_ipa_config) : 0; } QDF_STATUS ipa_obj_setup(struct wlan_ipa_priv *ipa_ctx)