summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-15Snap for 11224086 from 1ce89f702faf0228507f62d20e91a026d80b67e1 to ↵aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010Android Build Coastguard Worker
mainline-tzdata5-release Change-Id: I51f3f7c58f2a4228efb9a5103949d7002b31bbca
2023-09-12HAL: Fixed to invalidate global func ptr in clean_up routine am: b6aef0956eDennis Jeon
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/24687439 Change-Id: Iffd87e82ff3246e4d87001e7c326ba2d124b9f06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12HAL: Fixed to invalidate global func ptr in clean_up routineDennis Jeon
VendorHAL calls wifi_cleaned_up_handle late, giving LegacyHAL a chance to call a new API. In current implementation, VendorHAL would not call wifi_cleaned_up_handle in wifi_clean_up context(). It defers calling it to another context. wifi_cleaned_up_handle calls invalidate() and it makes global_handle_ as NULL. so, it needs to be fixed to call cleaned_up_handler in cleanup routine instead of event_loop thread. It will avoid incoming command from LegacyHAL after cleanup routine. Bug: 280956926 Bug: 285834754 Test: Regression test Change-Id: Ia12e37dc9bd5ce7041acdb38fbb10a29f1020857 Signed-off-by: Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com> (cherry picked from commit b6309b2c53ae97883eee2f75194b816614698f86) Merged-In: Ia12e37dc9bd5ce7041acdb38fbb10a29f1020857
2023-05-10Snap for 10103804 from 68236de9ae117f14b8068684e90a056cb478cbb3 to ↵Android Build Coastguard Worker
mainline-tzdata5-release Change-Id: I39b750fe443727b6ff360589b6fcfdee5ba1c48c
2023-04-06Updating the vendor hal with new rtt result struct am: 21e159afa7Ajay Davanageri
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/22410646 Change-Id: Ie0f2d8e31c0fe26132d2ef002f5c0ba278ace4d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04Updating the vendor hal with new rtt result structandroid14-devAjay Davanageri
Applied patch#13 Bug: 253425912 Test: Tested using the halutil Change-Id: I4fcf961a66200b9045ed0e2d8764c9cc7037174f Merged-In: I4fcf961a66200b9045ed0e2d8764c9cc7037174f Signed-off-by: Ajay Davanageri <ajay.davanageri@broadcom.corp-partner.google.com> (cherry picked from commit 83c63617aff44b060bd108861a3ccde64d37e39e)
2023-03-15[automerger skipped] Merge "Merge Android 13 QPR2" am: e648c4b867 -s ours ↵Xin Li
am: c5a7141082 -s ours am: 7d72af9491 -s ours am: 1064a42f7c -s ours am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2486792 Change-Id: I49a5b7c033c18c84ddd1231bf3e25e0069336ce7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 831a24dbe7 -s ours am: ↵Xin Li
069e27142e -s ours am: abd27defea -s ours am: 6c90dca629 -s ours am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2486792 Change-Id: Ie599e5c57c54b406465340cfc827455da342cb67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge "Merge Android 13 QPR2" am: e648c4b867 -s ours ↵Xin Li
am: c5a7141082 -s ours am: 7d72af9491 -s ours am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2486792 Change-Id: I273e3955cff17f665108be0e88b07f60c472ba23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 831a24dbe7 -s ours am: ↵Xin Li
069e27142e -s ours am: abd27defea -s ours am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2486792 Change-Id: I66b8f04dfd65cc1776f3b28b43a8a5e895f8fc2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge "Merge Android 13 QPR2" am: e648c4b867 -s ours ↵Xin Li
am: c5a7141082 -s ours am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2486792 Change-Id: Iff8edca01813a7eca799cbe9805c05c516e65c8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 831a24dbe7 -s ours am: ↵Xin Li
069e27142e -s ours am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2486792 Change-Id: I0a79bf9a689575cdf4394ca1b7a44a0c1c8fbfcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge "Merge Android 13 QPR2" am: e648c4b867 -s oursXin Li
am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2486792 Change-Id: I2dfaffd861c458267c65d181b0365db970dfa592 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 831a24dbe7 -s oursXin Li
am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2486792 Change-Id: I2627b546f655a929f0bbf7dd4401b345a627d9ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Merge "Merge Android 13 QPR2"android-u-beta-1-gplXin Li
2023-03-13Merge Android 13 QPR2Xin Li
Bug: 273316506 Merged-In: Id998c69ca1dccbd3108c2e78f065521cdac45135 Change-Id: I7ab5fdbcc63dec554b38e61251317da46a55a741
2023-03-08Snap for 9710098 from 9577a5a731db9a29ed7d20f9028302efa485235a to ↵Android Build Coastguard Worker
mainline-tzdata5-release Change-Id: I76d86bf6ac782137c9d70f4597c0ac2a58ab1e50
2023-02-23HAL: Fixed OOB read by assigning each param of Nancapabilities individually ↵chenpaul
am: 608e7e803f Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/21551539 Change-Id: Icac9e5816771867fca70bf1618cc130c689d30d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23HAL: Fixed OOB read by assigning each param of Nancapabilities individuallychenpaul
This is a fix from pa/2386395, which avoid memcpy to keep backward compatibility Bug: 265225404 Test: BRCM halutil (brcm_halutil -nan -get_capabilities) Change-Id: I3dedfa9060c4bfa38de65446d6661423f278c614
2023-02-14HAL: Fixed OOB read by assigning each param of Nancapabilities individuallyDennis Jeon
NOTE: This is a fix for pa/2366563. In pa/2366563, get_vendor_data_len() represents the size of nan_hal_resp_t in the DHD not size of NanCapabilities. It causes a crash issue again since memcpy's third argument still represents 88 bytes which is defined in Legacy HAL. (x2 register value - 0000000000000058) Fixed it to assign each param individually instead of memcpy regardless of framework NanCapabilities change. Bug: 265225404 Test: BRCM halutil (brcm_halutil -nan -get_capabilities) Change-Id: I7632d7f38f3c0a8ab2269b043eb77a17fb5100c8 Signed-off-by: Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com>
2023-02-14Revert "Fix OOB write possible when len equals sizeof array"chenpaul
In this CL, get_vendor_data_len() still represents the size of nan_hal_resp_t in the DHD not size of NanCapabilities. It causes a crash issue again since memcpy's third argument still represents 88 bytes which is defined in Legacy HAL. (x2 register value - 0000000000000058 in the tombstone) This reverts commit 15500502b794953e025f7543b3bb1b0ed5aecf87. Bug: 265225404 Test: BRCM halutil (brcm_halutil -nan -get_capabilities) Change-Id: I3cc5fec3aed66655ba8d800fc31a57e342d18428
2023-02-02Merge "wlan: Update OWNERS"TreeHugger Robot
2023-02-01Add support of channel policy for sta connected peer networkAjay Davanageri
Cherry pick from: https://partner-android-review.git.corp.google.com/c/platform/hardware/broadcom/wlan/+/2366565 Bug: 238942305 Test: Verified using halutil Manually verified it via new vendor driver Change-Id: I8d9677edb46bc7cbc4370e3b0836322906077d54 Signed-off-by: Ajay Davanageri <ajay.davanageri@broadcom.corp-partner.google.com>
2023-02-01Snap for 9550733 from 2ca1d8205f224de33a985b9516bcea90d55c43ea to ↵Android Build Coastguard Worker
mainline-tzdata5-release Change-Id: I940ed8fe2a6452a9f293d51053eaca233fdd574d
2023-02-01wlan: Update OWNERSRoger Wang
Bug: 267401200 Test: N/A Change-Id: I1a4ba26541562d952c6be268935a76c49d52bed1
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
858d701518 -s ours am: c523fb1cc9 -s ours am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/20948812 Change-Id: I3229dbe886705127f124a381620a2c4cc482082f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
858d701518 -s ours am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/20948812 Change-Id: Ib2b94c3cf4082a1e41c05a915a8396084af266f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12HAL: Fixed OOB possible when NanCapabilities is not matched with driverDennis Jeon
Regardless of changing the NanCapabilities struct, memcpy is limited to the size passed by DHD. Bug: 265225404 Test: build pass and basic function works fine. Change-Id: Ifbb191ab9fd862ba34f5c2c7b230afef7af0b7a5 Signed-off-by: Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: Id998c69ca1dccbd3108c2e78f065521cdac45135 Change-Id: I0f402850afc5f8e7b09e112b8d9ab4f13d949cbe
2023-01-05Merge "Add vendor hal support for get cached scan results"TreeHugger Robot
2023-01-04Add vendor hal support for get cached scan resultsAjay Davanageri
Bug:232030878 Test: Verified using the halutil Change-Id: I0996329159da1a864df035b56ea4b004ebdf9860 Signed-off-by: Ajay Davanageri <ajay.davanageri@broadcom.corp-partner.google.com>
2022-12-29Fixed OOB read/write possible when len equals sizeof array am: a8bfe75958 ↵Dennis Jeon
am: ef56977e08 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/20800788 Change-Id: I0d0b869f741c747d86cf903febc4c39a857596ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29Fix OOB write possible when len equals sizeof array am: 15500502b7 am: ↵Dennis Jeon
17a101dc4d Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/20770980 Change-Id: If9f823aafd5409d2809b87ad8db9e571d44474f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29Fixed OOB read/write possible when len equals sizeof array am: a8bfe75958Dennis Jeon
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/20800788 Change-Id: I68a68c32357a35a6e56a45e061a3bf1aa66bbb8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29Fix OOB write possible when len equals sizeof array am: 15500502b7Dennis Jeon
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/20770980 Change-Id: I6b5019300ef3be58c9108858572a53f01a23148e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29Fixed OOB read/write possible when len equals sizeof arrayandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseDennis Jeon
OOB read/write possible in get_svc_hash() since it convert character until the string meets null terminated Added null terminated character before calling it. Bug: 261857862 Test: Checked with lldb Change-Id: Id998c69ca1dccbd3108c2e78f065521cdac45135 Signed-off-by: Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com>
2022-12-29Fix OOB write possible when len equals sizeof arrayDennis Jeon
service_specific_info_len sets as serviceSpecificInfo.size() In case of the len equals sizeof(service_specific_info), OOB write possible. Bug: 261857623 Test: tested with poc program Signed-off-by: Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com> Change-Id: Ifdaaf475555fd4c9836758d2e804fcee4f822a89
2022-12-20Updating the vendor hal with new rtt result structAjay Davanageri
Bug:253425912 Bug: 222186547 Test:Tested using the halutil Test: Tested using wifi rtt scan app Change-Id: I0a87238febca5289be27565449a9b59acb496e7d Signed-off-by: Ajay Davanageri <ajay.davanageri@broadcom.corp-partner.google.com>
2022-12-12[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 8a743ef1c1 -s ours am: 5b99260608 -s ours am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 3c346f2cdf is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: If6b7ad350f784aee131d1b9caaf460a351a2043f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge "Merge Android 13 QPR1" am: 9ff33a6867 -s ours ↵Xin Li
am: 84308aebf9 -s ours am: 5e1618ff47 -s ours am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: Ieee0f55375eff347b07e64db18c129473e383b7f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge "Merge Android 13 QPR1" am: 9ff33a6867 -s ours ↵Xin Li
am: 5a9dc145de -s ours am: a02084270d -s ours am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: I79faef7aeaa5c7a1046d8c1f144da1654a14d4f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: a7d394b31d -s ours am: ↵Xin Li
46206518dc -s ours am: 48cc80e6b7 -s ours am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: Id84af03ae0848ca293ffedb2767fdf5b25909257 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into ↵Automerger Merge Worker
stage-aosp-master am: 8a743ef1c1 -s ours am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 3c346f2cdf is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: I5b7d14ce0ffeffb734c894e41b74bcbb47238068 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge "Merge Android 13 QPR1" am: 9ff33a6867 -s ours ↵Xin Li
am: 84308aebf9 -s ours am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: I9572207b0dfc34a594b17a115a63942ef44ecdfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge "Merge Android 13 QPR1" am: 9ff33a6867 -s ours ↵Xin Li
am: 5a9dc145de -s ours am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: I48ca0967ec89a33ce8904bc6a30b5e3b5287b935 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: a7d394b31d -s ours am: ↵Xin Li
46206518dc -s ours am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: I7ff89df92642c009c346e3850c8212bf9c3f074a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into ↵Automerger Merge Worker
stage-aosp-master * changes: [automerger skipped] Merge "Merge Android 13 QPR1" am: 9ff33a6867 -s ours [automerger skipped] Merge Android 13 QPR1 am: a7d394b31d -s ours
2022-12-09[automerger skipped] Merge "Merge Android 13 QPR1" am: 9ff33a6867 -s oursXin Li
am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: Ic8ba0f47392a2c0710463280fb32fcfbe1f554ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: a7d394b31d -s oursXin Li
am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: I64da4f8a874089615f086a096ba57314e2b3b773 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge "Merge Android 13 QPR1" am: 9ff33a6867 -s oursXin Li
am skip reason: Merged-In Ic97678251a4962f44bef005b612359f43cf106f4 with SHA-1 9c11d1eebd is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2338402 Change-Id: Ib7a399b504bcfc5379d078296ac8628529079b48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 12:42:24 +0000