diff options
| author | Andrew Evans <andrewevans@google.com> | 2023-10-06 19:04:08 +0000 |
|---|---|---|
| committer | Andrew Evans <andrewevans@google.com> | 2023-10-06 19:04:08 +0000 |
| commit | af3b30c9ba16eadd5d7e574c4c92930b7ec8e7c1 (patch) | |
| tree | aae068c371cddea69f69de2d02b9a196e16a6500 | |
| parent | dfe0f2f0746f39c27edd513f474ac4f698f97542 (diff) | |
| parent | ba63a028f667da6a5ae6128a33700b0b95abd48a (diff) | |
| download | qcacld-android-msm-p11-5.15-tm-wear-kr3-dr-p11-d1.tar.gz | |
Merge 'qcacld-3.0: Fix uninitialized var and dereference of freed ptr issue'android-wear-13.0.0_r0.16android-wear-13.0.0_r0.15android-msm-p11-5.15-tm-wear-kr3-dr-p11-d1android-msm-p11-5.15-tm-wear-kr3-dr-p11
Bug: 300993484
Change-Id: Ib5bb450eb07c97da75d5343475bed3340d8be38f
Signed-off-by: Andrew Evans <andrewevans@google.com>
| -rw-r--r-- | components/mlme/core/src/wlan_mlme_main.c | 1 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_assoc_utils.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 1e08d1ac58..fe7d2a8df9 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -283,6 +283,7 @@ mlme_peer_object_created_notification(struct wlan_objmgr_peer *peer, if (QDF_IS_STATUS_ERROR(status)) { mlme_legacy_err("unable to attach peer_priv obj to peer obj"); qdf_mem_free(peer_priv); + return status; } qdf_wake_lock_create(&peer_priv->peer_set_key_wakelock, "peer_set_key"); diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index c10981e584..7b88419003 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -1867,7 +1867,7 @@ QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx, tDot11fIEeht_cap *eht_caps) { tSirMacRateSet temp_rate_set; - tSirMacRateSet temp_rate_set2; + tSirMacRateSet temp_rate_set2 = {0}; uint32_t i, j, val, min, is_arate; uint32_t phy_mode; uint8_t mcs_set[SIZE_OF_SUPPORTED_MCS_SET]; @@ -1891,8 +1891,6 @@ QDF_STATUS lim_populate_matching_rate_set(struct mac_context *mac_ctx, session_entry->extRateSet.numRates); temp_rate_set2.numRates = (uint8_t) session_entry->extRateSet.numRates; - } else { - temp_rate_set2.numRates = 0; } lim_remove_membership_selectors(&temp_rate_set); |