git.osdn.net Git - android-x86/system-bt.git/log

OSDN Git Service

(root) / android-x86 / system-bt.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Chienyuan [Mon, 5 Nov 2018 18:28:38 +0000 (10:28 -0800)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a skipped: f9606e1d89 skipped: c96313fb2c skipped: 9c2fb57cee am: 18515721e5 -s ours
am: 6408abcd83 -s ours

Change-Id: Iff25af63698a6a502b0cae09d16b54072b33ffbd

commit | commitdiff | tree

Chienyuan [Mon, 5 Nov 2018 18:24:35 +0000 (10:24 -0800)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a skipped: f9606e1d89 skipped: c96313fb2c skipped: 9c2fb57cee
am: 18515721e5 -s ours

Change-Id: I5b428c6b8ed1cd08d03a5f3c76f46a7211f2077d

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:29 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a skipped: f9606e1d89 skipped: c96313fb2c skipped: 9c2fb57cee

Change-Id: I9bb69caded703f74c79189f0cf78069e1fab9ca5

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:28 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a skipped: f9606e1d89 skipped: c96313fb2c

Change-Id: I29b39b9cd2b0390289b525bf50ce4080b4a9557a

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:27 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a skipped: f9606e1d89

Change-Id: Iee0814f1ed5a5decc214abad4721a84825cd53b1

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:26 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a

Change-Id: I5977408e04b4479c9aa2b5d16a03e18d7e9deced

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:25 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1

Change-Id: I406dd66fa46d18b70d48faedf810d6a3ddbe3fbc

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:50:52 +0000 (17:50 +0000)]

Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-mr1-dev

commit | commitdiff | tree

Myles Watson [Mon, 5 Nov 2018 17:36:58 +0000 (09:36 -0800)]

Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev am: f6dc20ea52
am: 0e1c94b72d

Change-Id: Iec488eec7467acd6c4c216f1412924e2860f33a3

commit | commitdiff | tree

Myles Watson [Mon, 5 Nov 2018 17:36:37 +0000 (09:36 -0800)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into oc-dev am: 518c50aaa9
am: e476de0364

Change-Id: I9d2e15050dbe5f77b1abf7cc67b952ed65e8d161

commit | commitdiff | tree

Myles Watson [Mon, 5 Nov 2018 17:33:38 +0000 (09:33 -0800)]

Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev
am: f6dc20ea52

Change-Id: Ia27e3b2a51ef75bc07b1ba5a8b5aa7064f4aadd6

commit | commitdiff | tree

Myles Watson [Mon, 5 Nov 2018 17:33:14 +0000 (09:33 -0800)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into oc-dev
am: 518c50aaa9

Change-Id: Ia8b2acfb4a82f90624459a3e49edbeae64d5481f

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:37 +0000 (17:16 +0000)]

Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c am: d474c386ef
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
  DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
  DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
  DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into oc-dev

* changes:
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c am: d474c386ef skipped: 0ea657053e
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c am: d474c386ef
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
  DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:07:59 +0000 (17:07 +0000)]

Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-mr1-dev

commit | commitdiff | tree

Chienyuan [Sat, 3 Nov 2018 04:42:58 +0000 (21:42 -0700)]

Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into oc-dev am: 97ed603b62
am: e81dc3a461

Change-Id: I30e08d61ec22e58faf4fb33978f2c1db7617b2a8

commit | commitdiff | tree

Chienyuan [Sat, 3 Nov 2018 04:31:37 +0000 (21:31 -0700)]

Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into oc-dev
am: 97ed603b62

Change-Id: I68020bb39483cf639ef295b657385a16c6680b90

commit | commitdiff | tree

Chienyuan [Thu, 11 Oct 2018 01:47:46 +0000 (09:47 +0800)]

DO NOT MERGE HFP: Check AT command buffer boundary during parsing

* add p_end parameter to tBTA_AG_AT_CMD_CBACK, bta_ag_at_hsp_cback
and bta_ag_at_hfp_cback to indicate effective data range of p_arg
* add checks for buffer copy overflow in bta_ag_at_hsp_cback and
bta_ag_at_hfp_cback
* add packet legnth checks with p_end in bta_ag_parse_cmer
* add packet length checks with p_end in bta_ag_parse_bac

Bug: 112860487
Test: manual
Change-Id: I6bbbc2ba29ad025c7d3ba023d8191af6a11c4aa9
(cherry picked from commit 749063afebb8324276a47bdfbf320aa70f94a8ba)

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]

Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f am: 289b3fa863
  [automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f
  DO NOT MERGE HFP: Check AT command buffer boundary during parsing

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]

Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into cw-f-dev

* changes:
[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f
DO NOT MERGE HFP: Check AT command buffer boundary during parsing

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]

Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]

Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into oc-dev

* changes:
  [automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f am: 289b3fa863 skipped: 04ade0fdc0
  [automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f am: 289b3fa863
  [automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f
  DO NOT MERGE HFP: Check AT command buffer boundary during parsing

commit | commitdiff | tree

Myles Watson [Thu, 25 Oct 2018 00:05:12 +0000 (17:05 -0700)]

DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

Bug: 115900043
Test: Sanity pairing and SDP PTS
Change-Id: Ib642f79ed22b65ede5ff786cb1e163d172480f11

commit | commitdiff | tree

Myles Watson [Fri, 2 Nov 2018 23:06:28 +0000 (16:06 -0700)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into oc-dev am: 74749c1996
am: 28c5c4ab20

Change-Id: Ic8085ac83b196a8101fd25b654bbea2468961216

commit | commitdiff | tree

Myles Watson [Fri, 2 Nov 2018 23:05:47 +0000 (16:05 -0700)]

Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into oc-dev am: 7d38013232
am: c5c82d09b4

Change-Id: I39323f25b6314cfddb5852f3b07afb99ba713399

commit | commitdiff | tree

Myles Watson [Fri, 2 Nov 2018 23:05:21 +0000 (16:05 -0700)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into oc-dev am: 6d6c82d9e0
am: a9291d7c8b

Change-Id: I194865fb7b0dbd79b6c698ff307fdc12a1f42f8f

commit | commitdiff | tree

Myles Watson [Fri, 2 Nov 2018 23:01:24 +0000 (16:01 -0700)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into oc-dev
am: 74749c1996

Change-Id: Ie0b18788113d43696ee9b0a35c8352bb4bf7c8a2

commit | commitdiff | tree

Myles Watson [Fri, 2 Nov 2018 22:59:55 +0000 (15:59 -0700)]

Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into oc-dev
am: 7d38013232

Change-Id: I4e52d6cbaa27dc59f90d5c0f7ee63bdac5d40667

commit | commitdiff | tree

Myles Watson [Fri, 2 Nov 2018 22:59:31 +0000 (15:59 -0700)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into oc-dev
am: 6d6c82d9e0

Change-Id: I4b9f9f0d282b966b123a36d2bf22a95f5ad89577

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3 am: e50ffa7119
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:47:59 +0000 (22:47 +0000)]

Merge changes from topic "am-3290ac2a-4a57-4151-aaf8-9695d2ed6348" into oc-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3 am: e50ffa7119 skipped: fc00aa02bf
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3 am: e50ffa7119
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43
  [automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501
  DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:44:07 +0000 (22:44 +0000)]

Merge "DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into oc-dev

* changes:
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa am: 0f2de3c3df skipped: a3dbdeece2
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa am: 0f2de3c3df
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
  DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa am: 0f2de3c3df
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
  DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
  DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 22:43:43 +0000 (22:43 +0000)]

Merge changes from topic "am-a8794701-2d32-4392-bf6f-9d00a3751e39" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3
  [automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e
  DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

commit | commitdiff | tree

Chienyuan [Thu, 11 Oct 2018 02:36:57 +0000 (10:36 +0800)]

DO NOT MERGE HFP: Check AT command buffer boundary during parsing

* add p_end parameter to tBTA_AG_AT_CMD_CBACK, bta_ag_at_hsp_cback
and bta_ag_at_hfp_cback to indicate effective data range of p_arg
* add checks for buffer copy overflow in bta_ag_at_hsp_cback and
bta_ag_at_hfp_cback
* add packet legnth checks with p_end in bta_ag_parse_cmer
* add packet length checks with p_end in bta_ag_parse_bac

Bug: 112860487
Test: manual
Change-Id: Idbfa2b8bd4c1a0aeeacfe34349851b3bc8de7c69
Merged-In: Idbfa2b8bd4c1a0aeeacfe34349851b3bc8de7c69
(cherry picked from commit 5b1ef1038e3f4e4371c3d6718bf0f684be65eb2b)

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Nov 2018 22:10:06 +0000 (22:10 +0000)]

[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f am: 289b3fa863 skipped: 04ade0fdc0

Change-Id: Ibc39203eb7fa7c245d29013126e47c4638fd3c6b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Nov 2018 22:10:05 +0000 (22:10 +0000)]

[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f am: 289b3fa863

Change-Id: I3510b09b67948fa640b028df8346077dc87ead51

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Nov 2018 22:10:04 +0000 (22:10 +0000)]

[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f

Change-Id: I15e13d82ec8f1aea4236044762e96e704f4275b2

commit | commitdiff | tree

Chienyuan [Thu, 11 Oct 2018 02:36:57 +0000 (10:36 +0800)]

DO NOT MERGE HFP: Check AT command buffer boundary during parsing

* add p_end parameter to tBTA_AG_AT_CMD_CBACK, bta_ag_at_hsp_cback
and bta_ag_at_hfp_cback to indicate effective data range of p_arg
* add checks for buffer copy overflow in bta_ag_at_hsp_cback and
bta_ag_at_hfp_cback
* add packet legnth checks with p_end in bta_ag_parse_cmer
* add packet length checks with p_end in bta_ag_parse_bac

Bug: 112860487
Test: manual
Change-Id: Idbfa2b8bd4c1a0aeeacfe34349851b3bc8de7c69
(cherry picked from commit 5b1ef1038e3f4e4371c3d6718bf0f684be65eb2b)

commit | commitdiff | tree

Ugo Yu [Fri, 2 Nov 2018 04:35:42 +0000 (21:35 -0700)]

[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev am: 5b3764ada2 -s ours
am: d23783330e -s ours

Change-Id: Ibf80fd7ad5da69b61a2f36181ff9989eeb52659a

commit | commitdiff | tree

Ugo Yu [Fri, 2 Nov 2018 04:31:37 +0000 (21:31 -0700)]

[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev
am: 5b3764ada2 -s ours

Change-Id: If234a0b7b075098d8f42153138d5a72a78fb82b9

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Nov 2018 04:17:54 +0000 (04:17 +0000)]

Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev

commit | commitdiff | tree

Ugo Yu [Mon, 29 Oct 2018 16:47:04 +0000 (00:47 +0800)]

DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data

Bug: 111450156

Change-Id: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
Merged-In: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
(cherry picked from commit b0125caafec2183d73fc899ce5a8aee43a6e54af)

commit | commitdiff | tree

Ugo Yu [Thu, 1 Nov 2018 18:25:35 +0000 (11:25 -0700)]

Merge changes from topic "am-6595535a-66ae-4551-9774-048441013dbf" into oc-dev am: 31d6e17ffa
am: c59c3fa0b2

Change-Id: I42910e2c4665250ff6cebfd6ad671db5c2a9969d

commit | commitdiff | tree

Ugo Yu [Thu, 1 Nov 2018 18:25:02 +0000 (11:25 -0700)]

Fix OOB in avrc_pars_browse_rsp am: 32a33dc12d
am: 8fe5c0bc2a

Change-Id: I826a12ff77f541d3400a8da4e6d4a0946ed7f85d

commit | commitdiff | tree

Ugo Yu [Thu, 1 Nov 2018 18:18:58 +0000 (11:18 -0700)]

Merge changes from topic "am-6595535a-66ae-4551-9774-048441013dbf" into oc-dev
am: 31d6e17ffa

Change-Id: Ic9a26f8c164d74731eda6ce98c26c60395e841a3

commit | commitdiff | tree

Ugo Yu [Thu, 1 Nov 2018 18:17:51 +0000 (11:17 -0700)]

Fix OOB in avrc_pars_browse_rsp
am: 32a33dc12d

Change-Id: I8b899527c6fe359dc0d4b009f539ef2b4270d7f7

commit | commitdiff | tree

TreeHugger Robot [Thu, 1 Nov 2018 18:04:03 +0000 (18:04 +0000)]

Merge changes from topic "am-6595535a-66ae-4551-9774-048441013dbf" into oc-dev

* changes:
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340 am: 8ee587afbb am: bf3c65e987 am: 6055cb79e5 skipped: 36f3c8f9f3
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340 am: 8ee587afbb am: bf3c65e987 am: 6055cb79e5
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340 am: 8ee587afbb am: bf3c65e987
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340 am: 8ee587afbb
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340
  DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:37:20 +0000 (16:37 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3 am: e50ffa7119 skipped: fc00aa02bf

Change-Id: I87a68dddfe4ef9a286300ba0544215150f047154

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:37:18 +0000 (16:37 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3 am: e50ffa7119

Change-Id: Idb717d5895c454b7e7661c67a5aef275df7634e3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:37:17 +0000 (16:37 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43 am: 07b95830b3

Change-Id: Ia5f3a475f290c5ebb76dd0256410cde567bb1e27

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:37:16 +0000 (16:37 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501 am: 4494b9be43

Change-Id: Ie42e3bd1a03ef61a7229ffa5d099127ee8048d2a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:37:14 +0000 (16:37 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 2091fe7501

Change-Id: I4bdd3180984cb58b839a4d0625dfb37cb5a4e405

commit | commitdiff | tree

Myles Watson [Thu, 25 Oct 2018 00:05:12 +0000 (17:05 -0700)]

DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr

Bug: 115900043
Test: Sanity pairing and SDP PTS
Change-Id: Ib642f79ed22b65ede5ff786cb1e163d172480f11

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:20:15 +0000 (16:20 +0000)]

[automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa am: 0f2de3c3df skipped: a3dbdeece2

Change-Id: I5e93b174e09bd4f1c143c90d9d0808aaa21ae6b2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:20:14 +0000 (16:20 +0000)]

[automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa am: 0f2de3c3df

Change-Id: I67e7de8e0560eb3d2bfd6b83c8318cf27235188b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:20:13 +0000 (16:20 +0000)]

[automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3 am: 3f5160f5aa

Change-Id: If1797511d46c172bac21c48b241beb6349d96367

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:20:12 +0000 (16:20 +0000)]

[automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e am: c1f3afedf3

Change-Id: I63664999ef4f512592a940d5bbeb8c64a7b31aff

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 16:20:11 +0000 (16:20 +0000)]

[automerger] DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp am: 840f70ca1e

Change-Id: Id89a5a5ac1a23b5d657bfe33bcc881f76746fac6

commit | commitdiff | tree

Myles Watson [Thu, 25 Oct 2018 22:27:03 +0000 (15:27 -0700)]

DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

Bug: 116319076
Test: Send a short MCAP response
Change-Id: I0452f7d2c0f4ecccc7a6501773e26b403b116179

commit | commitdiff | tree

Myles Watson [Thu, 25 Oct 2018 22:27:03 +0000 (15:27 -0700)]

DO NOT MERGE: MCAP: Check response length in mca_ccb_hdl_rsp

Bug: 116319076
Test: Send a short MCAP response
Change-Id: I0452f7d2c0f4ecccc7a6501773e26b403b116179

commit | commitdiff | tree

Myles Watson [Thu, 25 Oct 2018 21:33:33 +0000 (14:33 -0700)]

DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

Bug: 116108738
Test: send a malformed GET_IDLE command with no parameters
Change-Id: Ic57e748a06ea6d4fc16868310d3423ee71a7ac8c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 15:56:51 +0000 (15:56 +0000)]

[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c am: d474c386ef skipped: 0ea657053e

Change-Id: Ie48855e26a95d62c332c5f1689d0f90841c14bd9

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 15:56:50 +0000 (15:56 +0000)]

[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c am: d474c386ef

Change-Id: Ife89de3734feaaa11ca9a1f8ebabf26cf57e66cf

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 15:56:49 +0000 (15:56 +0000)]

[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c

Change-Id: I527b11967c2a207702e570914b07c219dcdcd12c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 15:56:48 +0000 (15:56 +0000)]

[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8

Change-Id: I137bcb668670c62a0970af340eaaea7e1e69d614

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Nov 2018 15:56:47 +0000 (15:56 +0000)]

[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981

Change-Id: I72ddadf35350b72a755d92be554a638d6ed476aa

commit | commitdiff | tree

Myles Watson [Thu, 25 Oct 2018 21:33:33 +0000 (14:33 -0700)]

DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

Bug: 116108738
Test: send a malformed GET_IDLE command with no parameters
Change-Id: Ic57e748a06ea6d4fc16868310d3423ee71a7ac8c

commit | commitdiff | tree

Ugo Yu [Fri, 26 Oct 2018 10:15:17 +0000 (18:15 +0800)]

Fix OOB in avrc_pars_browse_rsp

- Check packet length before assign bytes to the pointer.

Bug: 111451066
Test: PoC test

Change-Id: I8ce4f4678a043fc16b0beeea2345253e7542b506

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:12 +0000 (23:35 +0000)]

[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340 am: 8ee587afbb am: bf3c65e987 am: 6055cb79e5 skipped: 36f3c8f9f3

Change-Id: I05388dfce317c96f54d793e15c5aeb648d0dbb95

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:09 +0000 (23:35 +0000)]

[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340 am: 8ee587afbb am: bf3c65e987 am: 6055cb79e5

Change-Id: Ie32fce429a36bbd531929e0a2baaf64814e62f03

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:06 +0000 (23:35 +0000)]

[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340 am: 8ee587afbb am: bf3c65e987

Change-Id: If43dc850794289bec31c7a3d5853bb49f5571703

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:03 +0000 (23:35 +0000)]

[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340 am: 8ee587afbb

Change-Id: Id0a40d0a6138e05b9038a09751a53a3f6deef786

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:00 +0000 (23:35 +0000)]

[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c340

Change-Id: I43e5409e91d531854545e2d9ed10389f8f10db01

commit | commitdiff | tree

Ugo Yu [Mon, 29 Oct 2018 17:57:06 +0000 (01:57 +0800)]

DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data

Bug: 111450156

Change-Id: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
(cherry picked from commit b0125caafec2183d73fc899ce5a8aee43a6e54af)

commit | commitdiff | tree

Ugo Yu [Mon, 29 Oct 2018 16:47:04 +0000 (00:47 +0800)]

DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data

Bug: 111450156

Change-Id: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
(cherry picked from commit b0125caafec2183d73fc899ce5a8aee43a6e54af)

commit | commitdiff | tree

Jakub Pawlowski [Fri, 12 Oct 2018 08:24:22 +0000 (01:24 -0700)]

[automerger skipped] [automerger] Fix possible OOB read in process_service_search_rsp am: b6fa6e4fff am: 8c06d18eea am: dd2fbd1c21 am: ea12ddddf5 skipped: 3d2f54aa0f am: 572fa878ff -s ours
am: 2a054eb8de -s ours

Change-Id: If61dd897dcebc9f941b8e47dc4880bc9711762e6

commit | commitdiff | tree

Jakub Pawlowski [Fri, 12 Oct 2018 08:17:07 +0000 (01:17 -0700)]

[automerger skipped] [automerger] Fix possible OOB read in process_service_search_rsp am: b6fa6e4fff am: 8c06d18eea am: dd2fbd1c21 am: ea12ddddf5 skipped: 3d2f54aa0f
am: 572fa878ff -s ours

Change-Id: I85ef6f11735b1648f844a7abf46ff8606f829869

commit | commitdiff | tree

Jakub Pawlowski [Fri, 12 Oct 2018 06:46:03 +0000 (23:46 -0700)]

Fix possible OOB read am: 6e6c347e79
am: bd361ff770

Change-Id: I83f0e68dbd0f6f1a521215d6b2543c23734f486f

commit | commitdiff | tree

Jakub Pawlowski [Fri, 12 Oct 2018 06:36:49 +0000 (23:36 -0700)]

Fix possible OOB read
am: 6e6c347e79

Change-Id: I9fd741af3e611ace9b3d063670751e49852d007f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 12 Oct 2018 06:34:07 +0000 (06:34 +0000)]

[automerger] Fix possible OOB read in process_service_search_rsp am: b6fa6e4fff am: 8c06d18eea am: dd2fbd1c21 am: ea12ddddf5 skipped: 3d2f54aa0f

Change-Id: I694383e8c553b788926656c2ae03e8a3ca37b0ea

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 11 Oct 2018 22:20:37 +0000 (22:20 +0000)]

[automerger] Fix possible OOB read in process_service_search_rsp am: b6fa6e4fff am: 8c06d18eea am: dd2fbd1c21 am: ea12ddddf5

Change-Id: I70abf72ca237a386e3712dacae00329929efd22a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 11 Oct 2018 22:20:35 +0000 (22:20 +0000)]

[automerger] Fix possible OOB read in process_service_search_rsp am: b6fa6e4fff am: 8c06d18eea am: dd2fbd1c21

Change-Id: Ide25784c8161e3bf8e8bf19de71e810006a4ffd3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 11 Oct 2018 22:20:32 +0000 (22:20 +0000)]

[automerger] Fix possible OOB read in process_service_search_rsp am: b6fa6e4fff am: 8c06d18eea

Change-Id: I489c10b25faf0f1a0725e29b9f2bd7c1d17389e2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 11 Oct 2018 22:20:29 +0000 (22:20 +0000)]

[automerger] Fix possible OOB read in process_service_search_rsp am: b6fa6e4fff

Change-Id: Id18234fccee442ea5f2ff7ad9bcf193dd50226b3

commit | commitdiff | tree

Jakub Pawlowski [Wed, 10 Oct 2018 18:07:12 +0000 (20:07 +0200)]

Fix possible OOB read in process_service_search_rsp

Bug: 74249842
Change-Id: I0dbe43f0da1f5a8f14bcb69659752de4bd70ca98
Merged-In: I0dbe43f0da1f5a8f14bcb69659752de4bd70ca98

commit | commitdiff | tree

Jakub Pawlowski [Wed, 10 Oct 2018 17:35:37 +0000 (19:35 +0200)]

Fix possible OOB read

Bug: 74249842
Change-Id: I0dbe43f0da1f5a8f14bcb69659752de4bd70ca98

commit | commitdiff | tree

Ugo Yu [Tue, 25 Sep 2018 04:21:39 +0000 (21:21 -0700)]

[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev am: bc5bd697c9 -s ours
am: 77175af80b -s ours

Change-Id: Ic285392e964bd2f5d20f9d38bd79725512d4ea27

commit | commitdiff | tree

Ugo Yu [Tue, 25 Sep 2018 04:10:21 +0000 (21:10 -0700)]

[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev
am: bc5bd697c9 -s ours

Change-Id: I35806d7afb20585bd339bfc333769cd76559f862

commit | commitdiff | tree

TreeHugger Robot [Tue, 25 Sep 2018 03:52:21 +0000 (03:52 +0000)]

Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.