mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-15 01:01:56 -04:00
qcacmn: Address NULL pointer reference in scm_11d_handle_country_info()
When a 2G AP vap is brought up on a "WORLD" regdomain (say 0x30), reg_is_world_alpha2() returns true. Also "enable_11d_in_world_mode" is set true by default during reg psoc creation. When a regdomain is set, process master channel list is invoked during which "enable_11d_supp" is set to true as regdomain is "WORLD" and "enable_11d_in_world_mode" is also set to true. As "reg_11d" is enabled, during beacon and probe processing, country update is done and scm_11d_handle_country_info() is called. 11d feature is specific to MCL and hence on WIN code base, it causes invalid memory access and it panics. "enable_11d_in_world_mode" is MCL specific feature and is disabled for WIN to avoid any call to scm_11d_handle_country_info for WIN codebase. CRs-Fixed: 2310809 Change-Id: I7bcac4052c96917120adc59e9e2eaa0e3da8dff1
This commit is contained in:
parent
9cee4926f9
commit
1e838726f1
1 changed files with 1 additions and 1 deletions
|
|
@ -3225,7 +3225,7 @@ QDF_STATUS wlan_regulatory_psoc_obj_created_notification(
|
|||
soc_reg_obj->vdev_cnt_11d = 0;
|
||||
soc_reg_obj->restart_beaconing = CH_AVOID_RULE_RESTART;
|
||||
soc_reg_obj->enable_srd_chan_in_master_mode = false;
|
||||
soc_reg_obj->enable_11d_in_world_mode = true;
|
||||
soc_reg_obj->enable_11d_in_world_mode = false;
|
||||
|
||||
for (i = 0; i < MAX_STA_VDEV_CNT; i++)
|
||||
soc_reg_obj->vdev_ids_11d[i] = INVALID_VDEV_ID;
|
||||
|
|
|
|||
Loading…
Reference in a new issue