Commit graph

59222 commits

Author SHA1 Message Date
Steven Moreland
1db089dc83 Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7 am: ce44c8ac3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I51d7fd41157708b398888aac7f70dd09c397ee81
2020-08-04 23:37:56 +00:00
Steven Moreland
ce44c8ac3c Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I1cb83a4a22e205dddd10536f61392215d5cb33dc
2020-08-04 23:19:46 +00:00
Steven Moreland
0cb14f1fe7 Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I7d40bc3c63aa13c4050662f17b8a0854f8864ce4
2020-08-04 23:02:18 +00:00
Steven Moreland
64b312bbd8 Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I79dcbb310a2515e7f17ad2ebbb0367070084dab2
2020-08-04 22:46:49 +00:00
Steven Moreland
dc99a094dd Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I816b8858c69e6481299f942401a16b5b39cd8b69
2020-08-04 22:21:36 +00:00
Steven Moreland
d05ecb8d9d Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: Ifa0692e4966e78f4e180a2efc53db991177b6006
2020-08-04 22:03:55 +00:00
Steven Moreland
d8801aaad8 Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: Id247c7079c146da8eaf52f098027d5daa25ce8d8
2020-08-04 21:37:54 +00:00
Steven Moreland
a03d37d542 Merge "libutils: check vsnprintf error" into oc-dev 2020-08-04 21:20:36 +00:00
TreeHugger Robot
8d55340d88 [automerger skipped] Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f am: cf91151364 am: 84dcff4c6b am: cf6c14c850 -s ours am: 6f734f4802 -s ours am: 2384ca2ae5 -s ours am: 6d76455283 -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 40f657b9f4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619803

Change-Id: I09d186e53c9dcf115f975b42b0d6bc1eca3a71e8
2020-07-31 22:06:32 +00:00
TreeHugger Robot
6d76455283 [automerger skipped] Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f am: cf91151364 am: 84dcff4c6b am: cf6c14c850 -s ours am: 6f734f4802 -s ours am: 2384ca2ae5 -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 40f657b9f4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619803

Change-Id: I7dc5773941a3d7f3b560440b548271b43a14b833
2020-07-31 21:40:48 +00:00
TreeHugger Robot
2384ca2ae5 [automerger skipped] Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f am: cf91151364 am: 84dcff4c6b am: cf6c14c850 -s ours am: 6f734f4802 -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 40f657b9f4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619803

Change-Id: I626c2a0a1c7b138450236061b90c0595d5e9c560
2020-07-31 21:13:08 +00:00
TreeHugger Robot
6f734f4802 [automerger skipped] Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f am: cf91151364 am: 84dcff4c6b am: cf6c14c850 -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 f846413e62 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619803

Change-Id: I7da965fecbe3b8af3bb01b035bc5ef9b7cd11813
2020-07-31 20:47:05 +00:00
TreeHugger Robot
cf6c14c850 Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f am: cf91151364 am: 84dcff4c6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619803

Change-Id: Ie7b7a57f55ead23f8d382ac98eb5087a2c614b1b
2020-07-31 20:24:42 +00:00
TreeHugger Robot
84dcff4c6b Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f am: cf91151364
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619803

Change-Id: Idb480f2a4dc1aa0d929e17e7e568a9c1b05c8489
2020-07-31 20:03:44 +00:00
TreeHugger Robot
cf91151364 Merge "Fail explicitly on length overflow." into oc-dev am: ea8d38e77f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619803

Change-Id: I9a6def9ff590fdadb457e9a011df3532829d23f4
2020-07-31 19:45:35 +00:00
TreeHugger Robot
ea8d38e77f Merge "Fail explicitly on length overflow." into oc-dev 2020-07-31 19:24:50 +00:00
TreeHugger Robot
59793ffd3c [automerger skipped] Merge "Fail explicitly on length overflow." into qt-dev am: 30a74852b0 -s ours am: d9798c6c33 -s ours am: 437d4fbf3a -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 40f657b9f4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11641094

Change-Id: I68fc8be4a3fe49887e53f8f8858fe7593d130b32
2020-07-30 22:13:30 +00:00
TreeHugger Robot
3942540f31 [automerger skipped] Merge "Fail explicitly on length overflow." into qt-qpr1-dev am: 3e8e1e9011 -s ours am: d8d4e2fee7 -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 bff51b88aa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11738780

Change-Id: I025f79bf853d622c832ad313fd877f81a7c1e754
2020-07-30 22:13:22 +00:00
TreeHugger Robot
437d4fbf3a [automerger skipped] Merge "Fail explicitly on length overflow." into qt-dev am: 30a74852b0 -s ours am: d9798c6c33 -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 40f657b9f4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11641094

Change-Id: I3ef3360f038a711af363d20ffa393dd66f5e7847
2020-07-30 21:53:25 +00:00
TreeHugger Robot
d8d4e2fee7 [automerger skipped] Merge "Fail explicitly on length overflow." into qt-qpr1-dev am: 3e8e1e9011 -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 bff51b88aa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11738780

Change-Id: Ibd2724c9a8b0285d208d55b5dc71f50f657a0564
2020-07-30 21:53:18 +00:00
TreeHugger Robot
d9798c6c33 [automerger skipped] Merge "Fail explicitly on length overflow." into qt-dev am: 30a74852b0 -s ours
am skip reason: Change-Id Ie49975b8949fd12bbde14346ec9bbb774ef88a51 with SHA-1 40f657b9f4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11641094

Change-Id: I530996ecd0105ff1df2afb2069361717d391ad3a
2020-07-30 21:44:03 +00:00
TreeHugger Robot
3e8e1e9011 Merge "Fail explicitly on length overflow." into qt-qpr1-dev 2020-07-30 21:34:33 +00:00
TreeHugger Robot
30a74852b0 Merge "Fail explicitly on length overflow." into qt-dev 2020-07-30 21:21:49 +00:00
Steven Moreland
ee22384c54 libutils: check vsnprintf error
For encoding errors, this function will return a negative value which
causes problems down the line. Check for an error and return. Also,
integer overflows are guarded.

Bug: 161894517
Test: fuzzer test case
Change-Id: Ia85067d4258bde4b875c832d6223db5dd26b8838
Merged-In: Ia85067d4258bde4b875c832d6223db5dd26b8838
2020-07-30 17:29:34 +00:00
Xin Li
1ce21745e6 Merge stage-aosp-rvc-ts-dev into rvc-dev am: 1b804d13e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12203423

Change-Id: Ia9f84f5899a648311cf936acec855cce6b8b449b
2020-07-24 08:26:19 +00:00
Xin Li
1b804d13e3 Merge stage-aosp-rvc-ts-dev into rvc-dev
Bug: 148878042
Merged-In: I54c668427c06c415584cc80d6e7d35d451b28393
Change-Id: I4c92f304137715a61d0a8fab07c57ca6ebb832fc
2020-07-21 20:31:38 +00:00
Xin Li
1521c58c5d Merge ab/12162526 into stage-aosp-rvc-ts-dev
Bug: 148878042
Change-Id: I54c668427c06c415584cc80d6e7d35d451b28393
2020-07-15 17:55:15 -07:00
Victor Khimenko
7f594d4fc0 Merge "Make libbacktrace buildable for native_bridge" into rvc-dev am: add3b3a137
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12128244

Change-Id: Ibcc0ad2e00559fafdc59abb03caf03edd2ed9bc8
2020-07-14 17:29:53 +00:00
Steven Moreland
bd6ac4c32c String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b am: 26b81f59d2 am: 8367a666b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I089a82a0c027667f5eefe769fa73c6a93ebcc532
2020-07-14 17:24:42 +00:00
Victor Khimenko
add3b3a137 Merge "Make libbacktrace buildable for native_bridge" into rvc-dev 2020-07-14 17:18:34 +00:00
Steven Moreland
8367a666b5 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b am: 26b81f59d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: Ib4704bc8a733ace56e7998b7bad5a6c5638900ad
2020-07-14 17:03:30 +00:00
Steven Moreland
26b81f59d2 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: Id47901d6e4247aafb9f666ba505ab966d3adefed
2020-07-14 16:45:16 +00:00
Steven Moreland
4e27b6992b String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I03057c052a24f205c78ee600178d45e0cd51a3c1
2020-07-14 16:29:09 +00:00
Steven Moreland
64fb5012b8 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I3ab9771d898eea0158acfd07fbe5a2f4b7dad883
2020-07-14 16:12:53 +00:00
Steven Moreland
9be245c3f0 String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I22f6b8299b4b77be31859a10b14efe01b297d531
2020-07-14 15:51:29 +00:00
Steven Moreland
107f18cb61 String16::remove - avoid overflow am: 4048e49956
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: I4dedf81e3471473e589a858e14d7a9ae5f91b3d9
2020-07-14 15:37:25 +00:00
Ray Essick
8ae969d240 extend syscall minijail for clang code coverage am: c8766043aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12137689

Change-Id: Ibacceb9054ebf91809a8bb05c243d2835be1b77d
2020-07-13 18:43:04 +00:00
Ray Essick
c8766043aa extend syscall minijail for clang code coverage
cutover to clang-based code coverage uses extra system call (ftruncate)
when writing coverage data. exposed while generating coverage for media.extractor.

Bug: 160917521
Test: build, boot, kill -37 extractors for {arm,x86}x{32,64}
Change-Id: I555b168c7aab43caa590df951861b92e8fa14bc3
2020-07-13 08:45:22 -07:00
Victor Khimenko
fb60e6c9ae Make libbacktrace buildable for native_bridge
Bug: http://b/153609531

Test: m -j64 libbacktrace.native_bridge

Change-Id: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406
Merged-In: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406
2020-07-10 20:13:23 +02:00
Tom Cherry
62de73aeb0 Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev am: 8272339d93
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12121904

Change-Id: I29fbf50c75b2622f95d272b7a76a9ce3a276f6ad
2020-07-09 23:03:50 +00:00
Tom Cherry
8272339d93 Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev 2020-07-09 22:53:44 +00:00
Tom Cherry
5c8457ef9a init: skip RejectsCriticalAndOneshotService for devices launched before R
This restriction is only added for devices launching with R or later.

Bug: 160663765
Test: this test runs when appropriate
Merged-In: I2353bfa7f598bd19ba57498cc5bbad7a3ed34707
Change-Id: I2353bfa7f598bd19ba57498cc5bbad7a3ed34707
(cherry picked from commit 0e40ba3183)
2020-07-09 14:36:12 -07:00
Yifan Hong
9d3c9c5bfb Merge changes I51628abe,I412d62b7 into rvc-dev am: 82e0c384f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12100252

Change-Id: I7d39ed1dd8e0ab8a153a6e78d71ed818dbbeab1c
2020-07-08 19:11:35 +00:00
Yifan Hong
82e0c384f3 Merge changes I51628abe,I412d62b7 into rvc-dev
* changes:
  Wrap flock with TEMP_FAILURE_RETRY.
  Try locking after mounting metadata
2020-07-08 18:57:30 +00:00
Yifan Hong
bd6d2cded8 Wrap flock with TEMP_FAILURE_RETRY.
flock may return EINTR. There are code using LockShared() to test
existance of the directory. Don't fail spuriously.

Test: pass
Bug: 160457903
Change-Id: I51628abe05599422eb3f344781d8f3acd653c822
2020-07-08 18:57:24 +00:00
Yifan Hong
44033e75cc Try locking after mounting metadata
In rescue mode, if /metadata is mounted but /metadata/ota does
not exist, immediately unmount /metadata and fallback to the code
path when /metadata is not mounted; that is, old partitions are
overwritten.

Test: in recovery, select wipe then immediately sideload
Bug: 160457903
Change-Id: I412d62b7005c81a7126106edc471622e6a7ef813
2020-07-08 11:00:10 +00:00
TreeHugger Robot
a54f950e89 Merge "Remove SkipMountingPartitions from vendor libfstab" into rvc-dev am: 46a58a5925
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12075405

Change-Id: Ie6935fc6c19689dbd6a82c032b9b4ef21eb41bdf
2020-07-07 02:15:46 +00:00
TreeHugger Robot
46a58a5925 Merge "Remove SkipMountingPartitions from vendor libfstab" into rvc-dev 2020-07-07 02:01:59 +00:00
Yifan Hong
91033bdb76 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev am: 2ce3ddfee1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12087943

Change-Id: I3b3db23e9ab8e4195a47fe68800fdce9e40b769c
2020-07-06 20:32:51 +00:00
Yifan Hong
2ce3ddfee1 Merge "liblp: Force 10.0 metadata on downgrade to Q." into rvc-dev 2020-07-06 20:24:02 +00:00