Commit Graph

58486 Commits

Author SHA1 Message Date
David Anderson 8696a5d11b remount: Do not allow remounting during checkpoints.
Bug: 157540389
Test: manual test
Change-Id: I5931a583e48ddac05f319629ae2f7f5f0f6cf032
2020-06-18 11:51:01 -07:00
Elliott Hughes d4171773a5 Explicitly show the destination filename for a bugreport.
It's in the progress output, but typically gets truncated.

Bug: https://issuetracker.google.com/131112559
Test: adb bugreport
Change-Id: I35ba4f39941aea68f2412e7b64feaac4da2f82e3
2020-06-18 11:05:38 -07:00
Narayan Kamath b82ec57b44 Merge "Fix Deadlock Issue On AppFuseBridge" am: 1e03ef5ac9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1219563

Change-Id: I5fddba76878a64f9e361151ae5b15bd821179b02
2020-06-18 12:45:47 +00:00
Narayan Kamath 1e03ef5ac9 Merge "Fix Deadlock Issue On AppFuseBridge" 2020-06-18 12:29:25 +00:00
Tom Cherry 7a5ae6dd88 Merge "logd: fix various clang-tidy issues" am: 4739f752e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1342013

Change-Id: I891a655abbdf9697024f51c22eeb18900f935cae
2020-06-17 21:01:21 +00:00
Tom Cherry 4739f752e1 Merge "logd: fix various clang-tidy issues" 2020-06-17 20:52:34 +00:00
Tom Cherry 9b4246dc2d logd: fix various clang-tidy issues
In order of severity:
1) Add a CHECK() that a pointer is not nullptr, where the analyzer
   believes this is possible.
2) Add `final` appropriately to functions called from constructors.
3) Add missing cloexec flags.
4) Add missing `noexcept` and other subtle performance warnings

Test: build with clang-tidy
Change-Id: Ifd9a1299a51027a47382926b2224748b5750d6cf
2020-06-17 11:40:55 -07:00
Tom Cherry 2dc7952e44 Merge "liblog: fix reading pmsg" am: a6dd55737a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1341014

Change-Id: I9535af260cf9eae83fa9b725b5cf1595c6429f7d
2020-06-17 18:27:41 +00:00
Tom Cherry a6dd55737a Merge "liblog: fix reading pmsg" 2020-06-17 18:15:28 +00:00
Tom Cherry 520470249e Merge "logd: add missing static to CompressionEngine" am: 58c7c24765
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1340721

Change-Id: I1577618efe5c7fbe7e3dc2539f3e5be23606dc68
2020-06-17 17:21:07 +00:00
Tom Cherry 58c7c24765 Merge "logd: add missing static to CompressionEngine" 2020-06-17 17:13:04 +00:00
Tom Cherry 34d7bd98ad liblog: fix reading pmsg
d3ecc66b9c "liblog: support extended logger_entry headers" removed
the logger_entry::msg variable and instead uses hdr_size as an offset
from logger_entry to where the message starts in parent log_msg
buffer.

In pmsg, hdr_size is not recorded and therefore uninitialized when it
was referenced, causing corruption when reading last logcat.  This
change uses sizeof(log_msg->entry) instead.

Bug: 158263230
Test: last logcat works
Change-Id: Ic01e73bf4d8ba8419cc770138565aa1210a6078b
2020-06-17 09:34:51 -07:00
Tom Cherry 4f9fed24bc logd: add missing static to CompressionEngine
Test: build
Change-Id: I8b068e137835ce5e1ce2af1911f557cbcaca0fa2
2020-06-17 08:31:25 -07:00
Joshua Duong 4f1c40957a Merge "[adb] Check for null in mdns connect info." am: cf88259783
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1340738

Change-Id: Ibc07b1c4f7f2ace1093f434f755fc6a17ae79fc6
2020-06-17 01:33:33 +00:00
Joshua Duong cf88259783 Merge "[adb] Check for null in mdns connect info." 2020-06-17 01:23:54 +00:00
Joshua Duong 282385f823 [adb] Check for null in mdns connect info.
Adb client does not use these values, so just ignore it.

Bug: b/158824677

Test: 'adb -H 127.0.0.1 -P 5037 devices' does not crash.
Change-Id: I4dada6e5e1714157bbf1af370510dfa7bfbd6b17
2020-06-16 16:40:46 -07:00
Tom Cherry e2ef4c2369 Merge "logging: Use more inclusive language." am: e72b290c8e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1339609

Change-Id: I60ec83c3774610cccf87544efce512b592167600
2020-06-16 22:48:42 +00:00
Treehugger Robot 8d5b49845b Merge "libmodprobe: improve error reporting." am: 2ab39411eb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1339492

Change-Id: I741f095314ec535af90b5aee3baa24e58ef16c58
2020-06-16 22:48:07 +00:00
Tom Cherry e72b290c8e Merge "logging: Use more inclusive language." 2020-06-16 22:36:15 +00:00
Treehugger Robot 2ab39411eb Merge "libmodprobe: improve error reporting." 2020-06-16 22:22:13 +00:00
Tom Cherry 0efb410013 logging: Use more inclusive language.
Also generic syntax clean up and removing some unused aspects (sorting
the list and the TODO increasing performance based on this sorting).

Test: logging unit tests
Change-Id: I56bb3866c13cb4c28bd48665bf32ec620cf0278e
2020-06-16 14:31:31 -07:00
Treehugger Robot 494ce517ab Merge "llkd: Use more inclusive language" am: f9033832cf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1339481

Change-Id: Ide017898eb7592b13df9d0a382618ddfd9e8418d
2020-06-16 20:48:03 +00:00
Treehugger Robot f9033832cf Merge "llkd: Use more inclusive language" 2020-06-16 20:34:33 +00:00
Treehugger Robot 24d0e12b3e Merge changes I14ed0839,I59f9fde5 am: 4db1b12b3c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1339607

Change-Id: Ie4dd55349f1128cdf8a36e6ed5b49c0e14267088
2020-06-16 19:01:41 +00:00
Treehugger Robot 4db1b12b3c Merge changes I14ed0839,I59f9fde5
* changes:
  modprobe: Use more inclusive language for libmodprobe (Part Deux)
  modprobe: Use more inclusive language for modprobe and libmodprobe
2020-06-16 18:50:12 +00:00
Elliott Hughes 1ab2c02324 libmodprobe: improve error reporting.
Bug: http://b/159064719
Test: treehugger
Change-Id: Ie3ea73a934a30b4674b30fd3823f59f062418ac7
2020-06-16 11:48:28 -07:00
Mark Salyzyn 6d9e515905 llkd: Use more inclusive language
Documentation is synchronized to match external, to ease updating.

blacklist is replaced with ignorelist or ignore depending on context.

Test: none
Change-Id: I6db7ad321684759e3c5ac1f66f940b6e8a5709a0
2020-06-16 10:28:14 -07:00
Tom Cherry 395bbc52d2 Merge "logd: add a SerializedLogBuffer suitable for compression" am: 1e412e7d4e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1326216

Change-Id: Ia7246ba8aa6192b67f83606d916c0808494c8d6a
2020-06-16 17:01:42 +00:00
Tom Cherry 36d60f5581 Merge "fsmgr: fix integer overflow in fs_mgr" am: be42841c61
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1335698

Change-Id: I00164049a8b8e878855ee13f45b596a3cccb1472
2020-06-16 17:01:34 +00:00
Tom Cherry 1e412e7d4e Merge "logd: add a SerializedLogBuffer suitable for compression" 2020-06-16 16:55:25 +00:00
Tom Cherry be42841c61 Merge "fsmgr: fix integer overflow in fs_mgr" 2020-06-16 16:54:48 +00:00
Mark Salyzyn 9debda17ab modprobe: Use more inclusive language for libmodprobe (Part Deux)
Remove blacklist

Test: none
Change-Id: I14ed08390a7db0b4b962343c61d60230751047ce
2020-06-16 05:14:09 -07:00
Treehugger Robot f9537f222b Merge "init.rc: chmod pagetypeinfo to 440 to be captured in BRs" am: a5032be8e0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1335693

Change-Id: I7f64eb4d18f662c4bbe802c2d2950d5c46df67a4
2020-06-16 08:38:42 +00:00
Treehugger Robot a5032be8e0 Merge "init.rc: chmod pagetypeinfo to 440 to be captured in BRs" 2020-06-16 08:30:15 +00:00
Haoran.Wang 4a489450f4 fsmgr: fix integer overflow in fs_mgr
As the EXT4_MAX_BLOCK_SIZE defined as 65536 which reached maxium value
of unsigned int. The superblock value maybe larger than 65536. This is
found by the Integer Overflow Sanitizer.

This patch fixed below boot error when userdata is corrupted:
init: processing action (fs) from
(/vendor/etc/init/hw/init.freescale.rc:221)
init: [libfs_mgr]Invalid ext4 superblock on '/dev/block/by-name/userdata'
init: InitFatalReboot: signal 6 init: #00 pc 00000000000af7e8  /system/bin/init
(android::init::InitFatalReboot(int)+208) init: #01 pc 00000000000afbd0  /system/bin/init
(android::init::InstallRebootSignalHandlers()::$_22::__invoke(int)+32)
init: #02 pc 00000000000006bc  [vdso:0000ffff9691b000] (__kernel_rt_sigreturn)
init: #03 pc 000000000004e070  /system/lib64/bootstrap/libc.so (abort+176)
init: #04 pc 000000000003427c  /system/lib64/libfs_mgr.so
(read_ext4_superblock(std::__1::basic_string<char, std::__1::char_
traits<char>, std::__1::allocator<char> > const&,
android::fs_mgr::FstabEntry const&, ext4_super_block*, int*)+1804)

Test: boot with corrupted ext4 superblock

Change-Id: I58ed723afa9975d0e93f96fad7c55465e68b3edd
Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
2020-06-16 15:54:37 +08:00
Yifan Hong f32197f28a Merge "libsnapshot_test: hardcode alignment." am: 83c23a0650
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1330937

Change-Id: I497dcb257ca4e310ed9e52f8a4443a5f08ae7189
2020-06-15 22:38:40 +00:00
Yifan Hong 83c23a0650 Merge "libsnapshot_test: hardcode alignment." 2020-06-15 22:29:34 +00:00
Yifan Hong b544de9b24 libsnapshot_test: hardcode alignment.
SnapshotUpdateTest uses a relatively small super partition, which
requires a small alignment and 0 alignment offset to work. For the
purpose of this test, hardcode the alignment and offset.
This test isn't about testing liblp or libdm.

Bug: 154355449
Bug: 157437632
Bug: 158718136
Bug: 157633441
Bug: 154646936

Test: atest on devices with alignment of data partition >= 512KiB

Change-Id: I1d0474f028cc824bd4197d0228350395239b3b81
2020-06-15 22:29:24 +00:00
Treehugger Robot 35fd48b54a Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." am: 53122b14bc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1323282

Change-Id: I73dca84b1908e1c2c0b45e53a75d4559e3dace51
2020-06-15 20:13:32 +00:00
Treehugger Robot 53122b14bc Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." 2020-06-15 20:05:15 +00:00
Mark Salyzyn 703fb74fb5 modprobe: Use more inclusive language for modprobe and libmodprobe
blacklist is replaced with blocklist.

Test: none
Change-Id: I59f9fde5900b9aee82aca1eab4a6ded3d136063b
2020-06-15 12:51:38 -07:00
Martin Liu 0abd0d6aa5 init.rc: chmod pagetypeinfo to 440 to be captured in BRs
Bug: 158928824
Test: Try BR
Change-Id: I2fa42780b77d86a234ae8b53d7264fbfd6a7906c
2020-06-15 15:24:43 +00:00
Roland Levillain 41ef412238 Merge "Rename native code coverage paths env. variable in libsnapshot's fuzz test." am: 9287716a1c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1329093

Change-Id: I89afbdcc5ad57dfef3b7ff81187a4084444a6535
2020-06-15 10:18:46 +00:00
Roland Levillain 9287716a1c Merge "Rename native code coverage paths env. variable in libsnapshot's fuzz test." 2020-06-15 10:12:10 +00:00
Nikita Ioffe d60f0708c9 Merge "Reboot sequence: Unmount active apexes before unmounting /data" am: b255195375
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1327913

Change-Id: I9c3f634a7ae890c21bc83c1de1d9c7a1ff38065f
2020-06-13 21:00:30 +00:00
Nikita Ioffe b255195375 Merge "Reboot sequence: Unmount active apexes before unmounting /data" 2020-06-13 20:50:21 +00:00
Wenhao Wang f20e589c00 Merge "trusty:storageproxyd: Fix in_cdb.length setting on send_ufs_rpmb_req" am: 55e8954950
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1334266

Change-Id: I931778780adf52ab9dcb756d2633451ed6369eb8
2020-06-13 01:40:47 +00:00
Wenhao Wang 55e8954950 Merge "trusty:storageproxyd: Fix in_cdb.length setting on send_ufs_rpmb_req" 2020-06-13 01:24:50 +00:00
Tianjie Xu dd513953ac Merge "Update libsnapshot to handle partial update" am: 8e1b80596f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1326217

Change-Id: I5d6658413141bc151d136293f5e37f8eefb4fecc
2020-06-12 23:14:05 +00:00
Nikita Ioffe 91a9848775 Reboot sequence: Unmount active apexes before unmounting /data
Having mounted apexes with loop back devices backing files on /data
partition will prevent clean unmount of it. Unmounting them and tearing
down loop devices should minimize the risk of that.

Note that it won't fix the issue completely, as there are a few (~2-3)
processes that keep restarting even after SIGKILL is sent. Which means
that they can still hold references to apexes on /data partition. But
in practice probability of this is quite low.

Test: adb reboot
Test: put tzdata apex in /data/apex/active && adb reboot
Bug: 158152940
Change-Id: I4624567b3d0f304dba4c6e37b77abd89e57411de
2020-06-13 00:13:11 +01:00