diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-12-31 18:30:04 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-12-31 18:30:04 -0800 |
| commit | 16e63a908f645c3e2b919ec4d329d6c72114411e (patch) | |
| tree | cb221a4f047d84ef522bde3c0954543d52914d71 | |
| parent | eaa35b297fd0d0b09ae370ea52f987b4e71165dd (diff) | |
| parent | 99acad13c365ad2c31bf8d8045bf59ab3ce18e45 (diff) | |
| download | wlan-16e63a908f645c3e2b919ec4d329d6c72114411e.tar.gz | |
Merge android13-gs-pixel-5.10-24Q1 into android13-gs-pixel-5.10-24Q2android-u-qpr3-beta-2_r0.7android-u-qpr3-beta-2_r0.6android-u-qpr3-beta-2_r0.5android-u-qpr3-beta-2_r0.4android-u-qpr3-beta-2_r0.3android-u-qpr3-beta-2_r0.2android-u-qpr3-beta-1_r0.7android-u-qpr3-beta-1_r0.5android-u-qpr3-beta-1_r0.4android-u-qpr3-beta-1_r0.3android-u-qpr3-beta-1_r0.2android-u-qpr3-beta-1_r0.1android-15-dp-2_r0.6android-15-dp-2_r0.5android-15-dp-2_r0.4android-15-dp-2_r0.3android-15-dp-2_r0.2android-15-dp-2_r0.1android-15-dp-1_r0.7android-15-dp-1_r0.5android-15-dp-1_r0.4android-15-dp-1_r0.3android-15-dp-1_r0.2android-15-dp-1_r0.1
SBMerger: 571992243
Change-Id: I5d5f52f1cd72f2f966ade3391b53e59a8be580b7
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | qcacld-3.0/core/hdd/src/wlan_hdd_cfg80211.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/qcacld-3.0/core/hdd/src/wlan_hdd_cfg80211.c b/qcacld-3.0/core/hdd/src/wlan_hdd_cfg80211.c index 760a74b..5e7076c 100644 --- a/qcacld-3.0/core/hdd/src/wlan_hdd_cfg80211.c +++ b/qcacld-3.0/core/hdd/src/wlan_hdd_cfg80211.c @@ -4919,12 +4919,13 @@ hdd_send_roam_scan_channel_freq_list_to_sme(struct hdd_context *hdd_ctx, return QDF_STATUS_E_INVAL; } - nla_for_each_nested(curr_attr, tb2[PARAM_SCAN_FREQ_LIST], rem) + nla_for_each_nested(curr_attr, tb2[PARAM_SCAN_FREQ_LIST], rem) { + if (num_chan >= SIR_MAX_SUPPORTED_CHANNEL_LIST) { + hdd_err("number of channels (%d) supported exceeded max (%d)", + num_chan, SIR_MAX_SUPPORTED_CHANNEL_LIST); + return QDF_STATUS_E_INVAL; + } num_chan++; - if (num_chan > SIR_MAX_SUPPORTED_CHANNEL_LIST) { - hdd_err("number of channels (%d) supported exceeded max (%d)", - num_chan, SIR_MAX_SUPPORTED_CHANNEL_LIST); - return QDF_STATUS_E_INVAL; } num_chan = 0; |