Commit Graph

29142 Commits

Author SHA1 Message Date
Jorge Lucangeli Obes ee5d1563f4 Merge "Check the return value of setuid(2)." am: 155d2bcb7a am: 4503269951
am: 4d7df0ffe5

Change-Id: I476fbb57e0beb524bd9d768f609a4c70ed50dcaa
2017-01-13 18:21:20 +00:00
bowgotsai e7914cbf59 Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" am: 8c301d22e4
am: 538cef7b48

Change-Id: I583a46b55ffc392da6e94eb0f2e156fadf4acd2e
2017-01-13 18:10:57 +00:00
Jorge Lucangeli Obes 4d7df0ffe5 Merge "Check the return value of setuid(2)." am: 155d2bcb7a
am: 4503269951

Change-Id: I2fc84f80f38f1afdddbdb4f7c1ca6ec0fe25f29d
2017-01-13 18:10:46 +00:00
bowgotsai 538cef7b48 Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp"
am: 8c301d22e4

Change-Id: I74645eef0fbb6ad5ebbc565f2e7b848bbd200959
2017-01-13 18:01:58 +00:00
Jorge Lucangeli Obes 4503269951 Merge "Check the return value of setuid(2)."
am: 155d2bcb7a

Change-Id: I6d2a0d65d21d525c411d142cfdd29b660ec2fab0
2017-01-13 18:01:45 +00:00
Treehugger Robot 8c301d22e4 Merge "fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp" 2017-01-13 17:57:45 +00:00
Treehugger Robot 155d2bcb7a Merge "Check the return value of setuid(2)." 2017-01-13 17:48:08 +00:00
Mark Salyzyn d971297708 Merge "trusty: use log/log.h for ALOG macros" am: dc40813167 am: 8548d54b2f am: 3d6a3d2a13
am: fd665590d5

Change-Id: Iddf206c52210a8a9d372c28c14463ca927b7d180
2017-01-13 16:01:37 +00:00
Mark Salyzyn fd665590d5 Merge "trusty: use log/log.h for ALOG macros" am: dc40813167 am: 8548d54b2f
am: 3d6a3d2a13

Change-Id: Idbd1c1556d3867c9b9a0247c845530b2cb16fc47
2017-01-13 15:56:20 +00:00
Mark Salyzyn 3d6a3d2a13 Merge "trusty: use log/log.h for ALOG macros" am: dc40813167
am: 8548d54b2f

Change-Id: Ibb9c38532e779a322858c5f018f713f46d065f3c
2017-01-13 15:44:36 +00:00
Jorge Lucangeli Obes f4ae42f6a8 Check the return value of setuid(2).
I'd like to mark setuid() WARN_UNUSED_RESULT to prevent security bugs.
This line would break because the file is compiled with -Werror.

Bug: 34251640
Test: Build, run unit test.
Change-Id: Ibb6fa5e5b899d47f77f2a32da762165de310101d
2017-01-13 15:43:45 +00:00
Mark Salyzyn 8548d54b2f Merge "trusty: use log/log.h for ALOG macros"
am: dc40813167

Change-Id: Id92489dd0b84255c1ec0033137cefd14181ca1c6
2017-01-13 15:40:05 +00:00
Mark Salyzyn dc40813167 Merge "trusty: use log/log.h for ALOG macros" 2017-01-13 15:32:39 +00:00
Mark Salyzyn 5654a887b1 trusty: use log/log.h for ALOG macros
Test: compile
Bug: 34250038
Change-Id: I12e7c6ea5a9ca950751fcf65352889650f198986
2017-01-13 07:30:11 -08:00
bowgotsai 47aa2a7520 fs_mgr: use std::string for function parameters in fs_mgr_dm_ioctl.cpp
Make the code more C++-ish by replacing char* or char** with
std::string&.

Bug: 31264231
Test: check device can boot with dm-verity
Change-Id: Ie3ca3f449b52959d1a7b2887d722eb5ce366c4f9
2017-01-13 17:39:04 +08:00
Wei Wang fc453321df Merge "libcutils: change klog_level to KLOG_INFO_LEVEL" am: 5e9863bf63 am: 974dd6291e am: c87d4ce758
am: a06b862257

Change-Id: I83876ce9b0258bc8c5217043f6ea9810a9bfd7a8
2017-01-13 08:22:40 +00:00
Wei Wang a06b862257 Merge "libcutils: change klog_level to KLOG_INFO_LEVEL" am: 5e9863bf63 am: 974dd6291e
am: c87d4ce758

Change-Id: I89a9aac59e09895b725a9d6e02c649d030746aa7
2017-01-13 08:20:24 +00:00
Wei Wang c87d4ce758 Merge "libcutils: change klog_level to KLOG_INFO_LEVEL" am: 5e9863bf63
am: 974dd6291e

Change-Id: Ib27b60748cb21cf470cf5e1004274c1d5e5d7617
2017-01-13 08:16:37 +00:00
Wei Wang 974dd6291e Merge "libcutils: change klog_level to KLOG_INFO_LEVEL"
am: 5e9863bf63

Change-Id: I3c3a4e21d803e615c9fab7cdb381b9e3c2586667
2017-01-13 08:13:37 +00:00
Treehugger Robot 5e9863bf63 Merge "libcutils: change klog_level to KLOG_INFO_LEVEL" 2017-01-13 08:08:26 +00:00
Elliott Hughes 15f0f504ac Move to .md files for even trivial documentation.
So it's automatically displayed for folks browsing the source.

Bug: N/A
Test: N/A
Change-Id: Ib595ab428054f274a92374728e3e66474ffc5116
2017-01-12 22:40:49 -08:00
bowgotsai 9ce6950262 Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp" am: a37ff0dd83 am: ca11618b25 am: bfe74a7ac3
am: e40e90c24d

Change-Id: I0e491ec1f826961c0cebb446ee57be0a9957aadd
2017-01-13 06:36:02 +00:00
bowgotsai e40e90c24d Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp" am: a37ff0dd83 am: ca11618b25
am: bfe74a7ac3

Change-Id: I148a63c8928db1b198472226b598d981203aab47
2017-01-13 06:33:50 +00:00
bowgotsai bfe74a7ac3 Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp" am: a37ff0dd83
am: ca11618b25

Change-Id: I682c0a0955ba1f2f330fe88608136a71282287a2
2017-01-13 06:29:31 +00:00
bowgotsai ca11618b25 Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp"
am: a37ff0dd83

Change-Id: Id611e9d1d887f6f568c5116069344da5111aa113
2017-01-13 06:26:01 +00:00
Treehugger Robot a37ff0dd83 Merge "fs_mgr: moves common functions out of fs_mgr_verity.cpp" 2017-01-13 06:21:39 +00:00
Wei Wang 677ba31db2 libcutils: change klog_level to KLOG_INFO_LEVEL
Some of Android componets e.g. init have migrated to use base/logging to get rid
of klog utilities. However, without explicit initilization, the default
klog_level is set to 3 which masks the logwrap output.
This patch sets default klog_level to KLOG_INFO_LEVEL to make
android_fork_execvp_ext log available.

Bug: 34256270
Test: manual
Change-Id: Ibe74707a92c954053cd0e6828a984fbd72b4acae
2017-01-12 22:18:46 -08:00
bowgotsai 3de625d109 fs_mgr: moves common functions out of fs_mgr_verity.cpp
This commits moves some common functions out of fs_mgr_verity.cpp to be
reused by other verified boot flows. It includes:
 - Move common functions into fs_mgr.c
 - Move dm_ioctl related functions to a new file: fs_mgr_dm_ioctl.cpp

Bug: 31264231
Test: check device can boot with dm-verity

Change-Id: Iaa0d8031efbaae12aa28f872f62d3fc3d3763b51
2017-01-13 10:52:44 +08:00
Mark Salyzyn 5c8bdf42e7 Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091 am: 112d1dcd95 am: 33807cd6c2
am: 07388af1e6

Change-Id: I3789497189d23724824babaacbc8aa442e7a026c
2017-01-12 23:57:31 +00:00
Mark Salyzyn 07388af1e6 Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091 am: 112d1dcd95
am: 33807cd6c2

Change-Id: I341970b6ddb6610418d85a378ef2984861858c65
2017-01-12 23:54:38 +00:00
Mark Salyzyn 33807cd6c2 Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091
am: 112d1dcd95

Change-Id: Iab735fcd94483bff17ef08bd48b471a26beb6de1
2017-01-12 23:52:07 +00:00
Mark Salyzyn 112d1dcd95 Merge "liblog: use log/log.h for ALOG macros"
am: dd9fa24091

Change-Id: I567d9f71c6407a7cb96ffa2e910a4b1c05876c87
2017-01-12 23:49:36 +00:00
Mark Salyzyn dd9fa24091 Merge "liblog: use log/log.h for ALOG macros" 2017-01-12 23:46:29 +00:00
Mark Salyzyn 51c33b7011 liblog: use log/log.h for ALOG macros
Test: compile
Bug: 34250038
Change-Id: I0f56c563871f377c03380498cd867b916892f1dc
2017-01-12 15:44:06 -08:00
Tomasz Wasilczyk 86ecbadd1b Merge "Fix typo in radio_metadata_t definition." am: ae770a4728 am: f9026b1059 am: b936ca317b
am: 2b9dd9e1c5

Change-Id: Ieefab70a4a28fe9320724d628582ee4ab2c747f9
2017-01-12 23:03:02 +00:00
Tomasz Wasilczyk 2b9dd9e1c5 Merge "Fix typo in radio_metadata_t definition." am: ae770a4728 am: f9026b1059
am: b936ca317b

Change-Id: I02bd5feff9041e76e56e0a35cca94c879bb99333
2017-01-12 23:00:33 +00:00
Tomasz Wasilczyk b936ca317b Merge "Fix typo in radio_metadata_t definition." am: ae770a4728
am: f9026b1059

Change-Id: I434bd0299f1b0a433edb36d82515745c724223bb
2017-01-12 22:58:31 +00:00
Tomasz Wasilczyk f9026b1059 Merge "Fix typo in radio_metadata_t definition."
am: ae770a4728

Change-Id: Ib8f9a1fa915dfa5c0600a70a02674f8d0d7ea677
2017-01-12 22:56:01 +00:00
Tomasz Wasilczyk ae770a4728 Merge "Fix typo in radio_metadata_t definition." 2017-01-12 22:52:58 +00:00
Josh Gao 2af02ff24f Merge "adb: remove support for legacy f_adb interface." am: 72d4c42cd5 am: 6865111e9c am: 5e0caf8d1b
am: bb7261421d

Change-Id: I7ef24f4fd1d4d951d293ff19eeeb8f16bd4188d0
2017-01-12 22:49:27 +00:00
Alex Deymo f53c03f188 Merge changes from topic 'host_suffix_cleanup' am: 7e0b322978 am: 130546f2d0 am: ec72ff2b89
am: c78efd7113

Change-Id: Ibdaa9dcc3c77a36946485b255d0dbbf4747fafa2
2017-01-12 22:49:11 +00:00
Alex Deymo 4786e4e24f Remove "_host" and "_static" suffix from libsparse definition. am: b0c395955d am: 7b8d66e7cc am: 11b65cf3be
am: 092a732ef2

Change-Id: I3d9639af9f9f66742660edbbf62f73909c0d6915
2017-01-12 22:45:52 +00:00
Alex Deymo 0638e0e65b Remove "_static" and "_host" suffix from libext4_utils. am: 705353ae27 am: c8f55cc5ca am: 8e3e4effaa
am: 31caef4170

Change-Id: Iaa09dc2c5693cbf889a60382df8051b5e5e74047
2017-01-12 22:45:45 +00:00
Josh Gao bb7261421d Merge "adb: remove support for legacy f_adb interface." am: 72d4c42cd5 am: 6865111e9c
am: 5e0caf8d1b

Change-Id: I96885973331c920ad26b96e016b30f05e4318e78
2017-01-12 21:40:40 +00:00
Alex Deymo c78efd7113 Merge changes from topic 'host_suffix_cleanup' am: 7e0b322978 am: 130546f2d0
am: ec72ff2b89

Change-Id: Idd87bed1d0253e6971cb00dbe098f38a6320f2d9
2017-01-12 21:40:23 +00:00
Alex Deymo 092a732ef2 Remove "_host" and "_static" suffix from libsparse definition. am: b0c395955d am: 7b8d66e7cc
am: 11b65cf3be

Change-Id: I3ed3e1b939006db8cb7e968654c16e393fdce6e9
2017-01-12 21:37:55 +00:00
Alex Deymo 31caef4170 Remove "_static" and "_host" suffix from libext4_utils. am: 705353ae27 am: c8f55cc5ca
am: 8e3e4effaa

Change-Id: Ie55012b07cb84ba642ff017ca6bcf74a304dde37
2017-01-12 21:37:48 +00:00
Josh Gao 5e0caf8d1b Merge "adb: remove support for legacy f_adb interface." am: 72d4c42cd5
am: 6865111e9c

Change-Id: Ic78675dffa8b27b8c0c2f17fb51cfa791e7a2143
2017-01-12 21:35:41 +00:00
Alex Deymo ec72ff2b89 Merge changes from topic 'host_suffix_cleanup' am: 7e0b322978
am: 130546f2d0

Change-Id: I6852d065d7a7ecb0a89a8335716a9328c71f3e57
2017-01-12 21:35:25 +00:00
Josh Gao 6865111e9c Merge "adb: remove support for legacy f_adb interface."
am: 72d4c42cd5

Change-Id: Ia23ec996c8ed9b40b23a347d1995197db8d45eb2
2017-01-12 21:33:16 +00:00