summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-17merge in oc-r6-release history after reset to oc-releaseandroid-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r3android-8.0.0_r2android-8.0.0_r1security-oc-releaseoreo-security-releasegitbuildkicker
2017-08-14release-request-49e3b466-076f-42b5-804c-ed9aab783aec-for-git_oc-r5-release-4 ↵android-8.0.0_r36android-8.0.0_r31android-8.0.0_r17oreo-r5-releaseandroid-build-team Robot
255676 snap-temp-L37500000092850661 Change-Id: Ifa41c453fd3dbea7279a1b28d815196778012d6d
2017-08-08Merge cherrypicks of [2686880, 2686702, 2686703, 2686704, 2686141, 2686142, ↵android-8.0.0_r35android-8.0.0_r16android-8.0.0_r10oreo-r4-releaseandroid-build-team Robot
2686143, 2686705, 2686706, 2686707, 2686782, 2686783, 2686784, 2686785, 2686786, 2686787, 2686788, 2686708, 2686144, 2686789, 2686709, 2686710, 2686711, 2686712, 2686713, 2686714, 2686715] into oc-r4-release Change-Id: Iafad31ecbb46bcc953c21be6fbbe4053eb150636
2017-08-08net: wireless: bcmdhd: update bcm4358 FW (7.112.300.14)Insun Song
added out of bounds check in below places 1) GTK processing 2) ICMPv6 RA processing Change-Id: I30f2ee5adf13d49ae31364b4883c2fbb61096ef6 Signed-off-by: Insun Song <insun.song@broadcom.com> Bug: 62575138 Bug: 62958086 (cherry picked from commit c5ee8afa2ce489a5c92be7881f7deb8572e38cdf)
2017-06-20release-request-8a29fe1b-a466-48e3-824a-9b3737e5c08a-for-git_oc-release-4115 ↵android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r30android-8.0.0_r28android-8.0.0_r15android-8.0.0_r13oreo-releaseoreo-r3-releaseoreo-cts-releaseandroid-build-team Robot
999 snap-temp-L30600000075741665 Change-Id: I6427557eff81568c6e8ae789de2635f4345e976f
2017-06-20bcm4343: Fix Remote code execution vulnerability am: 770dbc7d21oreo-devDavid C. Park
am: a45f9668b7 Change-Id: I96d3d434b6e14d742a2b8d47c5bcc03f9531d99f
2017-06-20bcm4343: Fix Remote code execution vulnerabilityDavid C. Park
am: 770dbc7d21 Change-Id: I5d36a2fc94985f6f1673d34545b0954bcd225895
2017-06-09bcm4343: Fix Remote code execution vulnerabilityDavid C. Park
Android Security Bulletin—April 2017 CVE-2017-0561: Remote code execution vulnerability version : 7.13.53.9 Bug: 62343917 Change-Id: Ib4810e072a1a2b649ea8bfa3ba65fdc15e0bb920
2017-06-07Merge ↵android-build-team Robot
"release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-release-4075595 snap-temp-L43000000071370789" into oc-release
2017-06-07release-request-224b654d-e3ad-4f05-a95d-d10d1516b3f6-for-git_oc-release-4075 ↵android-build-team Robot
622 snap-temp-L17600000071371496 Change-Id: If0513fd4cf02e9f3cd452fca25f040aee9525564
2017-06-07release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-release-4075 ↵android-build-team Robot
595 snap-temp-L43000000071370789 Change-Id: I910591c332339ef4c82b1210124bf36dafb29586
2017-06-06net: wireless: bcmdhd: update bcm4354/56 FW (7.35.101.6) am: c59d2fbfe0 am: ↵Insun Song
0e62f99bdb am: e334ee3322 Change-Id: I0e7c76b0dc4e180ce60cc39e0304d04af3cc98ab
2017-06-06net: wireless: bcmdhd: update bcm4354/56 FW (7.35.101.6) am: c59d2fbfe0Insun Song
am: 0e62f99bdb Change-Id: I5500eb1487fa4ec867a448867ec14dcda00fa40b
2017-06-06net: wireless: bcmdhd: update bcm4354/56 FW (7.35.101.6)Insun Song
am: c59d2fbfe0 Change-Id: I3e79248bb96f5d8eb42a48d6d3690108bde5f7ae
2017-06-06net: wireless: bcmdhd: update bcm4358 FW (7.112.201.4) [DO NOT MERGE]Insun Song
am: d09c96966d -s ours Change-Id: Ib480fd21dade90678dcdc98fab8fc66308468722
2017-06-05net: wireless: bcmdhd: update bcm4354/56 FW (7.35.101.6)Insun Song
adding validation for WME IE length in assoc request/response/beacon frame. This help to prevent buffer overrun especially when malformed WME/WME_PARAMETER IE injected by driveby attck. Signed-off-by: Insun Song <insun.song@broadcom.com> Bug: 38041027 Change-Id: Id3bcc264801582b1e283f3b3f7d9053681e3ce8e
2017-06-04net: wireless: bcmdhd: update bcm4358 FW (7.112.300.12)Insun Song
adding validation for WME IE length in assoc request/response/beacon frame. This help to prevent buffer overrun especially when malformed WME/WME_PARAMETER IE injected by driveby attck. Change-Id: I0daf4a69a69348c09bec2a79bbbb479e2b3a1067 Signed-off-by: Insun Song <insun.song@broadcom.com> Bug: 38041027
2017-06-04net: wireless: bcmdhd: update bcm4358 FW (7.112.201.4) [DO NOT MERGE]Insun Song
adding validation for WME IE length in assoc request/response/beacon frame. This help to prevent buffer overrun especially when malformed WME/WME_PARAMETER IE injected by driveby attck. Change-Id: I6dbe2b534d8d5aedac0bdfa8e5459d7d9a3ba4dd Signed-off-by: Insun Song <insun.song@broadcom.com> Bug: 38041027
2017-05-14release-request-951b3a8b-6c0c-4d2e-8af4-1c3f7e209f66-for-git_oc-release-4006 ↵android-build-team Robot
899 snap-temp-L39600000063784275 Change-Id: I4b3a505281a82c15812a921c334a7e3163b7635f
2017-05-12net: wireless: bcmdhd: adding bssid count NL attribute in SWC config am: ↵Insun Song
f57fbe1611 am: 79f1dd5850 am: 2498b6a272 Change-Id: Id2de1e7accb52538f2d00cde0096ed6d77a7242f
2017-05-12net: wireless: bcmdhd: adding bssid count NL attribute in SWC config am: ↵Insun Song
f57fbe1611 am: 79f1dd5850 Change-Id: I35b8795d5da7cff54ef11d2b110bc444936e2a1e
2017-05-12net: wireless: bcmdhd: adding bssid count NL attribute in SWC configInsun Song
am: f57fbe1611 Change-Id: I693ea4aa69d8086d0c4c024d5086de211e347ed1
2017-05-04net: wireless: bcmdhd: adding bssid count NL attribute in SWC configInsun Song
adding new NL attribute item which contain SWC BSSIDs count. This help for kernel driver to know it early before parsing whole NL buffer. and sort out security vulnerability cases where malicious buffer injected. Signed-off-by: Insun Song <insun.song@broadcom.com> Bug: 34973477 Change-Id: I1db053e722876e4b97d8f25fdc881279fa467bf6
2017-04-09merge in oc-release history after reset to oc-devgitbuildkicker
2017-04-06bcom hal: Add stubs for set/clear link statsRoshan Pius
Bcom HAL supports get_link_stats, but does not support set/clear_link_stats. This causes issues in the HIDL interface because even though bcom supports link layer stats in general, these 2 functions for link stats return NOT_SUPPORTED. So, fake return SUCCESS for these functions from the bcom HAL. Bug: 37000188 Test: Compiles Change-Id: Iadc6392edc869f0045bfba844919abb609590823
2017-03-07Merge "Move libwifi-hal and dependencies to /vendor" am: 95ca193da4 am: ↵Roshan Pius
052255ec30 am: 0e31efd7b9 Change-Id: I00aca365103fa548b8b7eade2b74eddc9491699f
2017-03-07Merge "Move libwifi-hal and dependencies to /vendor" am: 95ca193da4Roshan Pius
am: 052255ec30 Change-Id: Iae143c835da10d0e62e3f0bc4f077f148c5ca26a
2017-03-07Merge "Move libwifi-hal and dependencies to /vendor"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Roshan Pius
am: 95ca193da4 Change-Id: Ib808997648ceb2e3f8e45e3b5afa77b48573d86a
2017-03-07Merge "Move libwifi-hal and dependencies to /vendor"android-o-preview-1android-n-mr2-preview-2o-previewRoshan Pius
2017-03-03Move libwifi-hal and dependencies to /vendorRoshan Pius
Bug: 34457880 Test: Device boots up and able to connect to wifi networks. Change-Id: I7351e52d5baabeef4f57a6d0f606ada093dd2d67
2017-03-01merge in oc-release history after reset to mastergitbuildkicker
2017-02-25Move libwifi-hal and dependencies to /vendorRoshan Pius
Bug: 34457880 Test: Device boots up and able to connect to wifi networks. Change-Id: I7351e52d5baabeef4f57a6d0f606ada093dd2d67
2017-02-19merge in oc-release history after reset to mastergitbuildkicker
2017-02-16net: wireless: bcmdhd: add bssid count element in hotlist cfg am: 66d8254696 ↵Insun Song
am: 80c7a6aa50 am: 44c2d6161c am: 33160c11b8 Change-Id: Ibe6020fbf0841ac773529d329cbee36abc2c71c7
2017-02-16net: wireless: bcmdhd: add bssid count element in hotlist cfg am: 66d8254696 ↵Insun Song
am: 80c7a6aa50 am: c2789261e8 am: 0d6d7a13c4 Change-Id: I42e151ddd7ce01ab8a09e67236548023f9a13571
2017-02-16net: wireless: bcmdhd: add bssid count element in hotlist cfg am: 66d8254696 ↵Insun Song
am: 80c7a6aa50 am: 44c2d6161c Change-Id: I8d4b3c36c5ed9263eddbaba614ef708caf8668c2
2017-02-16net: wireless: bcmdhd: add bssid count element in hotlist cfg am: 66d8254696 ↵Insun Song
am: 80c7a6aa50 am: c2789261e8 Change-Id: I7075fdc1bc1473bc57c30c342bafa77a1d274317
2017-02-16net: wireless: bcmdhd: add bssid count element in hotlist cfg am: 66d8254696Insun Song
am: 80c7a6aa50 Change-Id: Ic6cd2bc29b04bed7ce235984c1d7e152b45f0b1d
2017-02-16net: wireless: bcmdhd: add bssid count element in hotlist cfg am: 66d8254696Insun Song
am: 80c7a6aa50 Change-Id: I0eb21bc987ee0728ee46cb72901ce93ab65290ca
2017-02-16net: wireless: bcmdhd: add bssid count element in hotlist cfgInsun Song
am: 66d8254696 Change-Id: I3460954741aef17e5ed5197aaab9f250d57a7eb0
2017-02-15net: wireless: bcmdhd: add bssid count element in hotlist cfgInsun Song
add new element to exactly refer in NL tlv iteration. Bug: 32474971 Change-Id: Icac65ad456fd01138a143206c7b1ce074c0cf740 Signed-off-by: Insun Song <insun.song@broadcom.com>
2017-02-13merge in oc-release history after reset to mastergitbuildkicker
2017-02-13merge in oc-release history after reset to mastergitbuildkicker
2017-02-10net: wireless: bcmdhd: update bcm4358 FW (7.112.300.11)Insun Song
- adding filter_ie capability advertise string Change-Id: Ia700578afe8d03a24823cd56c0b6a4b73d39e793 Signed-off-by: Insun Song <insun.song@broadcom.com> Bug: 35223963
2017-02-08net: wireless: bcmdhd: update bcm4358 FW (7.112.300.10)Insun Song
-fix for TDLS-FTIE buffer overrun issue Signed-off-by: Insun Song <insun.song@broadcom.com> Bug: 34199105 Change-Id: I3164a518a52fd6839fd781bacf38b2983fdb20d1
2017-02-08Merge "net: wireless: bcmdhd: update bcm4358 FW (7.112.300.9)"Ecco Park
2017-02-08Merge "Merge "net: wireless: bcmdhd: update bcm4354/56 FW (7.35.101.5)" into ↵Ecco Park
nyc-mr1-dev am: f790045af8 am: 56180a3b28 am: c8e97d9d5c" into nyc-mr2-dev-plus-aosp am: 849b095df3 Change-Id: I85402b4c702deab03637c2c98609dee40e1b0c56
2017-02-08Merge "net: wireless: bcmdhd: update bcm4354/56 FW (7.35.101.5)" into ↵Ecco Park
nyc-mr1-dev am: f790045af8 am: 56180a3b28 am: c8e97d9d5c am: 9b64f07418 Change-Id: Ibc038156904238bf399dc619d18d8c7597ba8c27
2017-02-08Merge "Merge "net: wireless: bcmdhd: update bcm4354/56 FW (7.35.101.5)" into ↵Ecco Park
nyc-mr1-dev am: f790045af8 am: 56180a3b28 am: a25503b71a" into nyc-mr2-dev-plus-aosp am: f83546ba94 Change-Id: If0a4fb30dcd6d7c610913f4325038ec7fd121958
2017-02-08Merge "net: wireless: bcmdhd: update bcm4354/56 FW (7.35.101.5)" into ↵Ecco Park
nyc-mr1-dev am: f790045af8 am: 56180a3b28 am: a25503b71a am: ed73c1f3eb Change-Id: I309754eaaaba1f761ca7767f239d67a2411dfb59