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

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

Ajay Panicker [Thu, 7 Jun 2018 03:07:30 +0000 (20:07 -0700)]

DO NOT MERGE: Don't reuse buffer when building response
am: 9bbce86038

Change-Id: I0b7edc528c15d05e2b07c2ad5b30c40a387eb87f

commit | commitdiff | tree

Ajay Panicker [Tue, 5 Jun 2018 23:08:06 +0000 (16:08 -0700)]

DO NOT MERGE: Don't reuse buffer when building response

Bug: 79541338
Test: Compile and connect to remote headset
Change-Id: I2d808f941d3c71fcb6306c733717624be10478e0

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 5 Jun 2018 07:41:38 +0000 (00:41 -0700)]

[automerger skipped] [automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a am: 862eb4827b am: e7c8891319 am: c25b7e056e am: 515cf6983e am: 8dca5d6981 skipped: 25fc5872de
am: d25b494ad6 -s ours

Change-Id: I73dc4042b7c4283bcca582638079c0fc4bab161c

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:50:22 +0000 (03:50 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a am: 862eb4827b am: e7c8891319 am: c25b7e056e am: 515cf6983e am: 8dca5d6981 skipped: 25fc5872de

Change-Id: Ic7d6036bf7b14dbc1979990181612dc8c0c35e71

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:29 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a am: 862eb4827b am: e7c8891319 am: c25b7e056e am: 515cf6983e am: 8dca5d6981

Change-Id: I10eba2bac9686a5f50b736d1bc38caa0cd56265a

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:27 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a am: 862eb4827b am: e7c8891319 am: c25b7e056e am: 515cf6983e

Change-Id: I30fe1a2edd100c78a3b4964f9687b7c666217ad0

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:24 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a am: 862eb4827b am: e7c8891319 am: c25b7e056e

Change-Id: I526e9afc2a7bb0e101f4d6a70e0e3cb1126e72ca

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:22 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a am: 862eb4827b am: e7c8891319

Change-Id: I84ba18bda5c2adbc83181bcd9fbea0291fb7a8e7

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:20 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a am: 862eb4827b

Change-Id: I336035e480bcd33d67b90543a9f81fe919dc649a

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:17 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a

Change-Id: Ibde13c7a9f0af5a7e4f38db226532780b8fc50fa

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:15 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880

Change-Id: I874adb503bb51f88ad7a934b697221f544fc5488

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:12 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb

Change-Id: I945a8ce34b41a7df4a3c853ad5b4ba51d0136251

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 31 May 2018 17:23:02 +0000 (10:23 -0700)]

Add checks whether the AVDTP element data length is valid

Bug: 78288378
Test: Manual: Python script and extra logging
Change-Id: I576d798d8b566946a3f2d973cb9d4e8dbd22d09e
Merged-In: I715b5977c833d33ff798f008fbf244effa13ea1f

commit | commitdiff | tree

Jack He [Tue, 5 Jun 2018 02:49:04 +0000 (19:49 -0700)]

Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev
am: 6f887610ac

Change-Id: Ib29a9d7fa791b539f1496a99dbbc3644e6760a5d

commit | commitdiff | tree

TreeHugger Robot [Tue, 5 Jun 2018 02:38:00 +0000 (02:38 +0000)]

Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev

* changes:
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55 am: b8af4e4a83 am: a5fc127aa7 am: 1321566723 skipped: 8e9b525909
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55 am: b8af4e4a83 am: a5fc127aa7 am: 1321566723
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55 am: b8af4e4a83 am: a5fc127aa7
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55 am: b8af4e4a83
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55
  DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 5 Jun 2018 01:30:00 +0000 (18:30 -0700)]

Merge "Add BT_HDR length check for received AVCTP packets" into oc-dev
am: 47660ad688

Change-Id: I2194af7ebcbc48db7d78421b61a07fd5f952c3fe

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 5 Jun 2018 01:29:33 +0000 (18:29 -0700)]

Merge "Add packet length check for received AVCTP packets" into oc-dev
am: 7f8d2f60e1

Change-Id: Iacb904337e82fff45e51b4c3526786c3b0cd5f0c

commit | commitdiff | tree

Pavlin Radoslavov [Tue, 5 Jun 2018 01:29:01 +0000 (18:29 -0700)]

Merge "Add checks whether the AVDTP element data length is valid" into oc-dev
am: 3c083d2d96

Change-Id: I3bb4b672c9ae6623da8ed76fafef15a6ce368a7e

commit | commitdiff | tree

TreeHugger Robot [Tue, 5 Jun 2018 01:00:53 +0000 (01:00 +0000)]

Merge "Add BT_HDR length check for received AVCTP packets" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 5 Jun 2018 01:00:38 +0000 (01:00 +0000)]

Merge "Add packet length check for received AVCTP packets" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 5 Jun 2018 00:58:27 +0000 (00:58 +0000)]

Merge "Add checks whether the AVDTP element data length is valid" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 00:49:12 +0000 (00:49 +0000)]

[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55 am: b8af4e4a83 am: a5fc127aa7 am: 1321566723 skipped: 8e9b525909

Change-Id: Ie598286e6577250401752aa4f8783761b683c470

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 00:49:10 +0000 (00:49 +0000)]

[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55 am: b8af4e4a83 am: a5fc127aa7 am: 1321566723

Change-Id: I61ca7ec910613a253d5611d71fdcf223a367ace4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 00:49:08 +0000 (00:49 +0000)]

[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55 am: b8af4e4a83 am: a5fc127aa7

Change-Id: I1cf449cd8ec0c4cbd3ca7176900b5c803cc24067

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 00:49:06 +0000 (00:49 +0000)]

[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55 am: b8af4e4a83

Change-Id: Ieab711bb2c2408a09c13032c775a819c2695cb87

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 00:49:03 +0000 (00:49 +0000)]

[automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d55

Change-Id: I63ea708b1a1c087724749cd587cbcad86e1fe30c

commit | commitdiff | tree

Jack He [Tue, 5 Jun 2018 00:40:42 +0000 (17:40 -0700)]

DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf

Bug: 79164722
Bug: 78286118
Test: make
Change-Id: I04fc994d9bca80aa4711118d3c5be02f2b809a48

commit | commitdiff | tree

Jack He [Tue, 5 Jun 2018 00:06:20 +0000 (17:06 -0700)]

[automerger skipped] [automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a am: eee28a5a06 am: 3ba9845cad am: 7211394f5a am: 8c679a453a am: 452fcb6a05 skipped: ffc7491237
am: ba0f19a644 -s ours

Change-Id: I9215defae8eeb6d083a0644984eb26c6a7302c08

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:53 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a am: eee28a5a06 am: 3ba9845cad am: 7211394f5a am: 8c679a453a am: 452fcb6a05 skipped: ffc7491237

Change-Id: Ieb47cc367f89bce412a30d1bf44117c014141cee

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:16 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a am: eee28a5a06 am: 3ba9845cad am: 7211394f5a am: 8c679a453a am: 452fcb6a05

Change-Id: I88ef6244852f3391a864cc13dc559d97cc8d61d6

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:14 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a am: eee28a5a06 am: 3ba9845cad am: 7211394f5a am: 8c679a453a

Change-Id: I57dfaa5eceea67bca11ba561a5010130be0066fe

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:12 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a am: eee28a5a06 am: 3ba9845cad am: 7211394f5a

Change-Id: I9a39f998411705e5062c9757db52778081be495c

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:10 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a am: eee28a5a06 am: 3ba9845cad

Change-Id: I17a958293bb80866db6348f68a3c477a48f7de53

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:07 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a am: eee28a5a06

Change-Id: I5018c4115f5502d5f88c955f77221339663eca91

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:05 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a

Change-Id: I1cd6cf2b54334cff0bb8568cb0dd5ef6121ca444

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:03 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23

Change-Id: I404328203b34b5e48d2d5fbca3667e9dac9ca742

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:01 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4

Change-Id: I12f77728b3ad0f10b3cd0f34a7068272573e6ea4

commit | commitdiff | tree

Jack He [Fri, 1 Jun 2018 21:00:42 +0000 (14:00 -0700)]

BNEP: Fix OOB access in bnep_data_ind

* Stop reading the L2CAP packet if packet length is 0
* Process the buffer for BNEP_EXTENSION_CONTROL packet before advancing
  the buffer pointer by length of payload
* Reject BNEP_EXTENSION_CONTROL packet when the payload size is zero
* Move error logging to more appropriate locations at where the OOB access
  is most likely triggered

Bug: 78286118
Bug: 79164722
Test: Send zero length L2CAP packet to BNEP, send invalid
      BNEP_EXTENSION_CONTROL packet
Change-Id: I7e18632b8faab1b6aaca1bff1b7f55d69962729e
Merged-In: I7e18632b8faab1b6aaca1bff1b7f55d69962729e
(cherry picked from commit 3c799a6e25abdf6bacb660ff7a06338836cc7356)

commit | commitdiff | tree

Jack He [Mon, 4 Jun 2018 22:31:24 +0000 (15:31 -0700)]

BNEP: Fix OOB access in bnep_data_ind
am: 0416340ffa

Change-Id: I45d6d2adb09316bcc231ae875d788885c40768c8

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 31 May 2018 18:04:54 +0000 (11:04 -0700)]

Add BT_HDR length check for received AVCTP packets

Bug: 79944113
Test: Code compilation
Change-Id: I02c76ab8fad61669394062bf34656ea32f465b6a
Merged-In: I02c76ab8fad61669394062bf34656ea32f465b6a
(cherry picked from commit 4262b932e487b19d578d79e0120cf03291f44efc)

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 31 May 2018 02:26:16 +0000 (19:26 -0700)]

Add packet length check for received AVCTP packets

Bug: 79944113
Test: Manual: Custom test program and extra logging
Change-Id: Icde465fed723bf876ce3885d11099fddcb92de81
Merged-In: Icde465fed723bf876ce3885d11099fddcb92de81
(cherry picked from commit 2a934acf498a6b715cc7c634123aa403a70fe9e6)

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 31 May 2018 00:56:14 +0000 (17:56 -0700)]

Add checks whether the AVDTP element data length is valid

Bug: 78288378
Test: Manual: Python script and extra logging
Change-Id: I715b5977c833d33ff798f008fbf244effa13ea1f
Merged-In: I715b5977c833d33ff798f008fbf244effa13ea1f
(cherry picked from commit 9b3f96f50287d8789aff6d6895d7ae02ca6ac619)

commit | commitdiff | tree

Jack He [Fri, 1 Jun 2018 21:00:42 +0000 (14:00 -0700)]

BNEP: Fix OOB access in bnep_data_ind

* Stop reading the L2CAP packet if packet length is 0
* Process the buffer for BNEP_EXTENSION_CONTROL packet before advancing
  the buffer pointer by length of payload
* Reject BNEP_EXTENSION_CONTROL packet when the payload size is zero
* Move error logging to more appropriate locations at where the OOB access
  is most likely triggered

Bug: 78286118
Bug: 79164722
Test: Send zero length L2CAP packet to BNEP, send invalid
      BNEP_EXTENSION_CONTROL packet
Merged-In: I7e18632b8faab1b6aaca1bff1b7f55d69962729e
Change-Id: I7e18632b8faab1b6aaca1bff1b7f55d69962729e
(cherry picked from commit 3c799a6e25abdf6bacb660ff7a06338836cc7356)

commit | commitdiff | tree

akirilov [Fri, 1 Jun 2018 20:25:32 +0000 (13:25 -0700)]

[automerger skipped] [automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16 am: b37a3d0a19 am: 5793ade00d am: 537c7ed692 am: 54cd4ff702 skipped: 2cdb021844 am: 829fbbbafc
am: 05e2099ec7 -s ours

Change-Id: I26454821d871dc16be108c2f2c1bfca4fd190b6b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:47 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16 am: b37a3d0a19 am: 5793ade00d am: 537c7ed692 am: 54cd4ff702 skipped: 2cdb021844 am: 829fbbbafc

Change-Id: I14ff2ec3933956c987c7354752ff357aa931beba

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:46 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16 am: b37a3d0a19 am: 5793ade00d am: 537c7ed692 am: 54cd4ff702 skipped: 2cdb021844

Change-Id: Icca2bb081562e0544ca1f31dfc323da155d3c10b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:27 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16 am: b37a3d0a19 am: 5793ade00d am: 537c7ed692 am: 54cd4ff702

Change-Id: I787623688baa19c03cc7855411c7b2432f3cdd46

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:26 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16 am: b37a3d0a19 am: 5793ade00d am: 537c7ed692

Change-Id: I11df3603cd3a8a9b31d088b8f543a3ce0ae97095

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:24 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16 am: b37a3d0a19 am: 5793ade00d

Change-Id: I00c61a56f5feed5d654f8a876d21a995bac6ab36

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:22 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16 am: b37a3d0a19

Change-Id: I95a38db1c94e545a10f894f56319cb9b38c465fa

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:21 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16

Change-Id: I164001793fe32ef903c430594d93dc800e8c396f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:19 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8

Change-Id: I36cca997401a549ed94036dd48efa7ba00d73fd4

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:17 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41

Change-Id: I9a8fc8c90e84297bde904dc30c31c745e0e15cbd

commit | commitdiff | tree

akirilov [Fri, 27 Apr 2018 22:05:14 +0000 (15:05 -0700)]

Fixes two bluetooth bugs causing remote overreads (2/2)

Bug: 74075873
Test: manual

Change-Id: I28a78084a1ab451b407ee6e7a5495c1e43ed757b
Merged-In: I76058b11c90dc40b78f26fb64b74d609f3473f5d

commit | commitdiff | tree

Jakub Pawlowski [Fri, 1 Jun 2018 18:39:49 +0000 (11:39 -0700)]

[automerger skipped] [automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0 am: c1b04d4179 am: 7f9f2bbf93 am: 6a80e4ae1a am: 94570f9e83 am: d0ba182019 skipped: 982e826b8e
am: 4d7bcbbeca -s ours

Change-Id: I46dbf84b1f84ddec1777aad4f2a97a5153c20d98

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 04:09:15 +0000 (04:09 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0 am: c1b04d4179 am: 7f9f2bbf93 am: 6a80e4ae1a am: 94570f9e83 am: d0ba182019 skipped: 982e826b8e

Change-Id: I77c6c4e56b07f27ac512d5947ff2201604912f4d

commit | commitdiff | tree

Atanas Kirilov [Fri, 1 Jun 2018 00:02:27 +0000 (17:02 -0700)]

Merge changes from topic "am-ba736da7-b534-414b-a405-b0397951e24d" into oc-dev
am: c691f7a61d

Change-Id: I49cc66fae3e6bbd7de8589ad6de17d6a5a3e5399

commit | commitdiff | tree

Atanas Kirilov [Fri, 1 Jun 2018 00:02:03 +0000 (17:02 -0700)]

Merge "RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)" into oc-dev
am: 4ac23a31e2

Change-Id: I7c0c0f1b6d8efae4f263d20f97041b2acffa78f6

commit | commitdiff | tree

Atanas Kirilov [Fri, 1 Jun 2018 00:01:36 +0000 (17:01 -0700)]

Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into oc-dev
am: 198c72a4a1

Change-Id: I31a10f2c1efd64c514f637af2691688276aefbcf

commit | commitdiff | tree

Atanas Kirilov [Fri, 1 Jun 2018 00:01:15 +0000 (17:01 -0700)]

Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into oc-dev
am: f8075ee202

Change-Id: I6b6021bcd6c1df0f1be34912cee13ba448890105

commit | commitdiff | tree

Atanas Kirilov [Fri, 1 Jun 2018 00:00:41 +0000 (17:00 -0700)]

Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into oc-dev
am: 1825f64fed

Change-Id: I970ec8ca35f66971985518866bc85cf5262089bd

commit | commitdiff | tree

Myles Watson [Fri, 1 Jun 2018 00:00:03 +0000 (17:00 -0700)]

Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into oc-dev
am: bef69c5242

Change-Id: Ib42e206cdeae17b1d417ee29d563037379bec9e2

commit | commitdiff | tree

Myles Watson [Thu, 31 May 2018 23:59:41 +0000 (16:59 -0700)]

Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff-nyc-dev" into oc-dev
am: bf322b5333

Change-Id: I35d221327cb3fdee665b32cf2ccce77124e811d7

commit | commitdiff | tree

Myles Watson [Thu, 31 May 2018 23:59:03 +0000 (16:59 -0700)]

Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into oc-dev
am: d1305de35a

Change-Id: I1ee0e824ef5fdf2e434a6505bc25ab026472151e

commit | commitdiff | tree

Jakub Pawlowski [Thu, 31 May 2018 23:47:19 +0000 (16:47 -0700)]

Merge "Decrease length after reading from array in process_service_attr_req" into oc-dev
am: ea5db7d0dd

Change-Id: Ib0106a936f256923819aa1acdefcad06e035b1c8

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:21 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0 am: c1b04d4179 am: 7f9f2bbf93 am: 6a80e4ae1a am: 94570f9e83 am: d0ba182019

Change-Id: I9a369b77217ff32c4e158a4f741e0689ac7d9ead

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:19 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0 am: c1b04d4179 am: 7f9f2bbf93 am: 6a80e4ae1a am: 94570f9e83

Change-Id: Ied31c4af4e55e38943c45b62588b02f16734fb77

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:17 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0 am: c1b04d4179 am: 7f9f2bbf93 am: 6a80e4ae1a

Change-Id: I2d103ea30fffae0be12e41cd9787fb8de760dc8a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:15 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0 am: c1b04d4179 am: 7f9f2bbf93

Change-Id: Ifb792068a2f2f190e8c43c96b6a512bdba907f5a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:12 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0 am: c1b04d4179

Change-Id: I3aa367983196c35c902d46e96b82378acd1b2e2b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:10 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0

Change-Id: I299635da00bbe1bbe165fadc6d585eeaa2518782

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:09 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d

Change-Id: I1de298ca18d15b94345fb616de4688b952a06dce

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:07 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e

Change-Id: I32728f7171047fc39b6d166bd6e13be053542c51

commit | commitdiff | tree

Jakub Pawlowski [Tue, 29 May 2018 23:25:56 +0000 (16:25 -0700)]

Decrease length after reading from array in process_service_attr_req

Test: compilation
Bug: 78136677
Change-Id: I4807a350e2b4764a93f104ce88f23a957a7e85c0
Merged-In: I4807a350e2b4764a93f104ce88f23a957a7e85c0

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:05:07 +0000 (22:05 +0000)]

Merge changes from topic "am-ba736da7-b534-414b-a405-b0397951e24d" into oc-dev

* changes:
[automerger skipped] RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2) skipped: 23918433c1
RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:05:07 +0000 (22:05 +0000)]

Merge "RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)" into nyc-mr2-dev

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:05:01 +0000 (22:05 +0000)]

Merge "RESTRICT AUTOMERGE: Fixes two bluetooth causing remote overreads (2/2)" into oc-dev

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:41 +0000 (22:04 +0000)]

Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into oc-dev

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]

Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880 am: 1550baf2c5 am: 2d0acadd8c skipped: addb4045bc
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880 am: 1550baf2c5 am: 2d0acadd8c
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880 am: 1550baf2c5
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]

Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into cw-f-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880 am: 1550baf2c5
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]

Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into nyc-mr1-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]

Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into nyc-dr1-dev

* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]

Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into nyc-dev

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]

Merge changes from topic "am-94f6d099-67a7-4fc1-95d1-65272646c688" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880 am: 1550baf2c5 am: 2d0acadd8c
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880 am: 1550baf2c5
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784 am: 11efe10880
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 4375ef1784
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

commit | commitdiff | tree