A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Fix KW issue in the regulatory component

Browse source 
In  I3c82e2eb98cdaf0ff8754bd990529a1833276304, KW error is reported in
the function, reg_compute_chan_to_freq.

This is because min_chan_range and max_chan_range can be assigned values,
that can cause array out of bounds issue.

To fix the issue, add explicit range checks against min_chan_range and
max_chang_range before iterating through master_chan_list to
avoid out of bound access.

Change-Id: Id5cd032fb899475720080b29012a6de1b5d4a916
CRs-Fixed: 2727082
This commit is contained in:
Hariharan Basuthkar 2020-06-19 12:30:45 +05:30 • committed by snandini
commit ae92ea605f
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
umac/regulatory/core/src/reg_services_common.c
View file

@ -1753,6 +1753,11 @@ static uint16_t reg_compute_chan_to_freq(struct wlan_objmgr_pdev *pdev,
return 0;
}
if (min_chan_range < MIN_CHANNEL || max_chan_range > MAX_CHANNEL) {
reg_err_rl("Channel range is invalid");
return 0;
}
chan_list = pdev_priv_obj->mas_chan_list;
for (count = min_chan_range; count <= max_chan_range; count++) {

3
umac/regulatory/dispatcher/inc/reg_services_public_struct.h
View file

@ -438,6 +438,9 @@ enum channel_enum {
NUM_CHANNELS,
MIN_CHANNEL = CHAN_ENUM_2412,
MAX_CHANNEL = (NUM_CHANNELS - 1),
MIN_24GHZ_CHANNEL = CHAN_ENUM_2412,
MAX_24GHZ_CHANNEL = CHAN_ENUM_2484,
NUM_24GHZ_CHANNELS = (MAX_24GHZ_CHANNEL - MIN_24GHZ_CHANNEL + 1),