OSDN Git Service
Elliott Hughes [Fri, 12 Aug 2016 20:25:40 +0000 (20:25 +0000)]
Merge "POSIX says <locale.h> makes NULL visible." am:
cea5c8a609 am:
96ea9e6fd5
am:
84a6471adf
Change-Id: Ib159e135c20702ea3bdc5cd0a3fd69e0d3edb3b0
Elliott Hughes [Fri, 12 Aug 2016 20:18:42 +0000 (20:18 +0000)]
Merge "Fix sysconf(_SC_ARG_MAX)." am:
51b3b44585 am:
8407ddebec
am:
50cef99a8f
Change-Id: Ia0e9fb045ba618918eab2e7e8b56386e53623249
Elliott Hughes [Fri, 12 Aug 2016 20:18:39 +0000 (20:18 +0000)]
Merge "Fix recvfrom prototype." am:
4a77fa3dcd am:
a7908ef625
am:
326498d787
Change-Id: Ia0b4d0e99a695d962d1d7c1a3081647f8529b6c5
Elliott Hughes [Fri, 12 Aug 2016 20:17:11 +0000 (20:17 +0000)]
Merge "POSIX says <locale.h> makes NULL visible." am:
cea5c8a609
am:
96ea9e6fd5
Change-Id: Idf796321f8b2a8d2114253fa64f47387ead53fd1
Elliott Hughes [Fri, 12 Aug 2016 20:10:02 +0000 (20:10 +0000)]
Merge "Fix sysconf(_SC_ARG_MAX)." am:
51b3b44585
am:
8407ddebec
Change-Id: Ia12b44244c8f11a7448ce0d6dde890e604396234
Elliott Hughes [Fri, 12 Aug 2016 20:09:59 +0000 (20:09 +0000)]
Merge "Fix recvfrom prototype." am:
4a77fa3dcd
am:
a7908ef625
Change-Id: If114779201ab100fd0b3dd88aed51082880d6ddd
Elliott Hughes [Fri, 12 Aug 2016 20:06:42 +0000 (20:06 +0000)]
Merge "POSIX says <locale.h> makes NULL visible."
am:
cea5c8a609
Change-Id: Ic28faf09d246aed6545eb4b11dbbb7af53a180f8
Elliott Hughes [Fri, 12 Aug 2016 19:59:22 +0000 (19:59 +0000)]
Merge "Fix sysconf(_SC_ARG_MAX)."
am:
51b3b44585
Change-Id: I9cbe4d41c1cb7422dadb13f28389ae44e8b8c325
Elliott Hughes [Fri, 12 Aug 2016 19:58:58 +0000 (19:58 +0000)]
Merge "Fix recvfrom prototype."
am:
4a77fa3dcd
Change-Id: I6824e7b6eafe1191c4a48830ace246fd7000a90d
Treehugger Robot [Fri, 12 Aug 2016 19:56:46 +0000 (19:56 +0000)]
Merge "POSIX says <locale.h> makes NULL visible."
Elliott Hughes [Fri, 12 Aug 2016 19:53:45 +0000 (19:53 +0000)]
Merge "Fix sysconf(_SC_ARG_MAX)."
Treehugger Robot [Fri, 12 Aug 2016 19:48:38 +0000 (19:48 +0000)]
Merge "Fix recvfrom prototype."
Elliott Hughes [Fri, 12 Aug 2016 19:30:07 +0000 (19:30 +0000)]
Merge "Fix pthread_barrierattr_getpshared prototype." am:
f8f2949744 am:
f232711408
am:
a37d8c88c1
Change-Id: I00e6de576715b3020f4f141a67b3cf4bc3d21205
Elliott Hughes [Fri, 12 Aug 2016 19:27:06 +0000 (19:27 +0000)]
Merge "Fix pthread_barrierattr_getpshared prototype." am:
f8f2949744
am:
f232711408
Change-Id: I7b172d98ebd09a216886be8f2565679b166193c0
Elliott Hughes [Fri, 12 Aug 2016 19:23:12 +0000 (19:23 +0000)]
Merge "Fix pthread_barrierattr_getpshared prototype."
am:
f8f2949744
Change-Id: I736800acfd412eac40685f6cc2ad56f19cadaeaa
Treehugger Robot [Fri, 12 Aug 2016 19:13:37 +0000 (19:13 +0000)]
Merge "Fix pthread_barrierattr_getpshared prototype."
Elliott Hughes [Fri, 12 Aug 2016 19:06:05 +0000 (19:06 +0000)]
Merge "POSIX says IPPORT_RESERVED is in <netdb.h>." am:
a1858a7f59 am:
f3308b92e9
am:
f55c9b54cc
Change-Id: I3ba3d3ddbdf973f0cf606fd6fb304e3a91acd437
Elliott Hughes [Fri, 12 Aug 2016 19:02:34 +0000 (19:02 +0000)]
Merge "POSIX says IPPORT_RESERVED is in <netdb.h>." am:
a1858a7f59
am:
f3308b92e9
Change-Id: I890bd73e97a9a720f2126bd9ec9b0c9ddbcbe8f6
Elliott Hughes [Fri, 12 Aug 2016 19:00:47 +0000 (19:00 +0000)]
Merge "POSIX says IPPORT_RESERVED is in <netdb.h>."
am:
a1858a7f59
Change-Id: I3a88b0f1d4749a4ad8596885578b3155b3e27578
Elliott Hughes [Fri, 12 Aug 2016 18:59:35 +0000 (18:59 +0000)]
Merge "POSIX says SEM_FAILED shall have type sem_t*." am:
5b45d2fec8 am:
e8469fd74f
am:
1c3bc54250
Change-Id: I14c3dad63ab4d0efb49e41f74f00082893fcbc73
Elliott Hughes [Fri, 12 Aug 2016 18:59:34 +0000 (18:59 +0000)]
Merge "POSIX says <fcntl.h> makes SEEK_* visible." am:
f135e4e56b am:
243fcc2786
am:
8c9383b5eb
Change-Id: Iaeda502b1d3ec6cbf0162b7b372298a6b2536eb8
Elliott Hughes [Fri, 12 Aug 2016 18:55:34 +0000 (18:55 +0000)]
Merge "POSIX says SEM_FAILED shall have type sem_t*." am:
5b45d2fec8
am:
e8469fd74f
Change-Id: Iff5d27f38282bf371ad2f919b2eab89dbf64692a
Elliott Hughes [Fri, 12 Aug 2016 18:55:34 +0000 (18:55 +0000)]
Merge "POSIX says <fcntl.h> makes SEEK_* visible." am:
f135e4e56b
am:
243fcc2786
Change-Id: I7aaf6664a87d885078bfc49b5046426d91198572
Elliott Hughes [Fri, 12 Aug 2016 18:53:18 +0000 (18:53 +0000)]
Merge "POSIX says SEM_FAILED shall have type sem_t*."
am:
5b45d2fec8
Change-Id: I695e085bf4e9efe442ce8f56b959d40e9a3ea0c2
Elliott Hughes [Fri, 12 Aug 2016 18:53:16 +0000 (18:53 +0000)]
Merge "POSIX says <fcntl.h> makes SEEK_* visible."
am:
f135e4e56b
Change-Id: Ia0fc8ebf78ce7885f268b04a97b2c1d1617605e6
Treehugger Robot [Fri, 12 Aug 2016 18:52:58 +0000 (18:52 +0000)]
Merge "POSIX says IPPORT_RESERVED is in <netdb.h>."
Treehugger Robot [Fri, 12 Aug 2016 18:42:44 +0000 (18:42 +0000)]
Merge "POSIX says SEM_FAILED shall have type sem_t*."
Treehugger Robot [Fri, 12 Aug 2016 18:35:17 +0000 (18:35 +0000)]
Merge "POSIX says <fcntl.h> makes SEEK_* visible."
Dimitry Ivanov [Fri, 12 Aug 2016 18:06:31 +0000 (18:06 +0000)]
Merge "linker: disallow W + E PT_LOAD segments" am:
e8087022c1 am:
3c2f0a2c39
am:
070b462b89
Change-Id: I33f9fa8d81b8cf5f009f5d8ea4f9c135a069977f
Dimitry Ivanov [Fri, 12 Aug 2016 18:03:00 +0000 (18:03 +0000)]
Merge "linker: disallow W + E PT_LOAD segments" am:
e8087022c1
am:
3c2f0a2c39
Change-Id: I34c0f54a0b3b605d5f30125d5c4bdd023c42dc47
Dimitry Ivanov [Fri, 12 Aug 2016 17:59:38 +0000 (17:59 +0000)]
Merge "linker: disallow W + E PT_LOAD segments"
am:
e8087022c1
Change-Id: I1732f395e90b4589720b3be89084ea1bd287c18d
Elliott Hughes [Fri, 12 Aug 2016 17:56:00 +0000 (17:56 +0000)]
Merge "Add two missing POSIX constant-only headers." am:
0e1b92af2f am:
c1d06e4655
am:
233d960892
Change-Id: I917cbbfa927a91ca9c21a8f2add5900b083ab76d
Dimitry Ivanov [Fri, 12 Aug 2016 17:55:35 +0000 (17:55 +0000)]
Merge "linker: disallow W + E PT_LOAD segments"
Elliott Hughes [Fri, 12 Aug 2016 17:52:29 +0000 (17:52 +0000)]
Merge "Add two missing POSIX constant-only headers." am:
0e1b92af2f
am:
c1d06e4655
Change-Id: Idc74bef4163d2f55cb3f13316dc29901052456f0
Elliott Hughes [Fri, 12 Aug 2016 17:49:01 +0000 (17:49 +0000)]
Merge "Add two missing POSIX constant-only headers."
am:
0e1b92af2f
Change-Id: Ifc4d9e82b2ecdc5b0d7394503b12e9985923ac52
Treehugger Robot [Fri, 12 Aug 2016 17:42:12 +0000 (17:42 +0000)]
Merge "Add two missing POSIX constant-only headers."
Elliott Hughes [Fri, 12 Aug 2016 17:38:35 +0000 (10:38 -0700)]
POSIX says IPPORT_RESERVED is in <netdb.h>.
In <netdb.h>:
http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/netdb.h.html
Not in <netinet/in.h>:
http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/netinet_in.h.html
Change-Id: Ie34cdb80eeb1443cf292944f3c68d8383aee2295
Elliott Hughes [Fri, 12 Aug 2016 17:28:52 +0000 (10:28 -0700)]
POSIX says SEM_FAILED shall have type sem_t*.
http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/semaphore.h.html
(Even if it didn't, this header previously referred to NULL without ensuring
that NULL was actually visible.)
Change-Id: I70577f4afc21f32c9e585076986127899ef8c8c1
Elliott Hughes [Fri, 12 Aug 2016 17:28:08 +0000 (10:28 -0700)]
POSIX says <locale.h> makes NULL visible.
http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/locale.h.html
Change-Id: I81a600153738dff6ce3d9cde95c787b71d81a368
Elliott Hughes [Fri, 12 Aug 2016 17:25:46 +0000 (17:25 +0000)]
Merge "Use sysinfo(2) to implement more of <sys/sysinfo.h>." am:
b17d845d9b am:
fb94c6396e
am:
bf74aa362d
Change-Id: Ib55e38785172da8afce78459f75e52e2c7cc73f1
Elliott Hughes [Fri, 12 Aug 2016 17:22:15 +0000 (17:22 +0000)]
Merge "Use sysinfo(2) to implement more of <sys/sysinfo.h>." am:
b17d845d9b
am:
fb94c6396e
Change-Id: I1f68772e42b10de599898285ffb844c2518adcb1
Elliott Hughes [Fri, 12 Aug 2016 17:18:51 +0000 (17:18 +0000)]
Merge "Use sysinfo(2) to implement more of <sys/sysinfo.h>."
am:
b17d845d9b
Change-Id: I68e9be7428268bf0f3bd54d8e14647aa89debc4e
Elliott Hughes [Fri, 12 Aug 2016 17:16:34 +0000 (10:16 -0700)]
POSIX says <fcntl.h> makes SEEK_* visible.
http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/fcntl.h.html
We already had two copies of these constants, so time to factor them out
into bits/.
Change-Id: I213c0d2372e41463593f878d338002b8eaa918cd
Treehugger Robot [Fri, 12 Aug 2016 17:07:41 +0000 (17:07 +0000)]
Merge "Use sysinfo(2) to implement more of <sys/sysinfo.h>."
Elliott Hughes [Fri, 12 Aug 2016 16:28:17 +0000 (09:28 -0700)]
Add two missing POSIX constant-only headers.
Change-Id: Ic175635a0edc16f9354445adeb7b90837d3e858b
Elliott Hughes [Fri, 12 Aug 2016 16:20:07 +0000 (09:20 -0700)]
Fix recvfrom prototype.
http://pubs.opengroup.org/onlinepubs/
9699919799/functions/recvfrom.html
Change-Id: Iba203c74045c88e53e28c2e0c8bc1f9ac63ce23e
Elliott Hughes [Fri, 12 Aug 2016 06:18:13 +0000 (23:18 -0700)]
Fix pthread_barrierattr_getpshared prototype.
As http://pubs.opengroup.org/onlinepubs/
9699919799/functions/pthread_barrierattr_getpshared.html
is my witness, there's a missing `const` here.
Change-Id: Ifd68188fb952460b64d144bdc21a53bc40ed82a7
Dimitry Ivanov [Thu, 11 Aug 2016 01:54:06 +0000 (18:54 -0700)]
linker: disallow W + E PT_LOAD segments
No mapped segment from the elf file can be writable and
executable at the same time. This commit adds a check
for malformed PT_LOAD segments in the elf-files.
Bug: http://b/
30146890
Test: run bionic-unit-tests --gtest_filter=dlfcn.*
Change-Id: Ia23acbe5a48780b65d7e4a50bbe024cd528079f4
Elliott Hughes [Thu, 11 Aug 2016 23:40:22 +0000 (23:40 +0000)]
Merge "dlerror returns char*, not const char*." am:
166f875eab am:
2ce52afba4
am:
041b0bce89
Change-Id: Ia3d4a0ee0ead60ff64729b6fdfc1774f2075c42f
Elliott Hughes [Thu, 11 Aug 2016 23:36:52 +0000 (23:36 +0000)]
Merge "dlerror returns char*, not const char*." am:
166f875eab
am:
2ce52afba4
Change-Id: I64fad256c5bbd2c10d80c1b80d10398a25a3f3ac
Elliott Hughes [Thu, 11 Aug 2016 23:33:58 +0000 (23:33 +0000)]
Merge "dlerror returns char*, not const char*."
am:
166f875eab
Change-Id: Ice8f136b647d9e343dfacfde71ce095a5fd25024
Treehugger Robot [Thu, 11 Aug 2016 23:16:59 +0000 (23:16 +0000)]
Merge "dlerror returns char*, not const char*."
Elliott Hughes [Thu, 11 Aug 2016 22:02:45 +0000 (15:02 -0700)]
dlerror returns char*, not const char*.
http://pubs.opengroup.org/onlinepubs/
9699919799/functions/dlerror.html:
char *dlerror(void);
...
The application shall not modify the string returned.
Change-Id: I5e684bfd3930c39a2a30ea6fd005a5d5d3e5b181
Elliott Hughes [Thu, 11 Aug 2016 21:51:31 +0000 (14:51 -0700)]
Use sysinfo(2) to implement more of <sys/sysinfo.h>.
We already had implementations of some of the functions, and I didn't
bother rewriting them when we added sysinfo(2). Ross Anderson said in
https://www.lightbluetouchpaper.org/2016/07/29/yet-another-android-side-channel/
that we should "simply disable access to all procfs files", which made
me curious how many places we use /proc in bionic. This is the one that's
obviously unnecessary. The others I'm not aware of alternative APIs for.
Change-Id: Ia64f36b76f29a7a1dd67845270a5472e121aae10
Dimitry Ivanov [Thu, 11 Aug 2016 20:06:08 +0000 (20:06 +0000)]
Merge "linker: use stat(2) to check file existence" am:
c623e7efc9 am:
6b94ab9724
am:
8ef6b1f938
Change-Id: Ia4be698767f4a7a99b787cf25800729d04709f31
Dimitry Ivanov [Thu, 11 Aug 2016 20:02:38 +0000 (20:02 +0000)]
Merge "linker: use stat(2) to check file existence" am:
c623e7efc9
am:
6b94ab9724
Change-Id: I8df11b84593d2b46101d26fae90dcf79a18702ad
Dimitry Ivanov [Thu, 11 Aug 2016 19:59:40 +0000 (19:59 +0000)]
Merge "linker: use stat(2) to check file existence"
am:
c623e7efc9
Change-Id: I05b28d10a1183f8ee4e7c711f6efc68cc4556326
Dimitry Ivanov [Thu, 11 Aug 2016 19:53:02 +0000 (19:53 +0000)]
Merge "linker: use stat(2) to check file existence"
Dimitry Ivanov [Thu, 11 Aug 2016 18:11:52 +0000 (11:11 -0700)]
linker: use stat(2) to check file existence
open(2) can be used to open directories; use stat to
check that the file exists and is a regular file.
Addresses review comments for
5aa67675f853af9588ac9274ecf86d7858695ce2
Bug: http://b/
30320104
Change-Id: Ia944db2f2f779a87ea01dd41dcd171e59c9bef01
Dimitry Ivanov [Thu, 11 Aug 2016 17:51:00 +0000 (17:51 +0000)]
Merge "linker_asan: Translate absolute dlopen paths to use asan-libraries." am:
cea35d77a2 am:
2fa91f4df8
am:
f9f554d50a
Change-Id: I526a47ff86018969a09cff01c45b4b4c2cd42d2a
Dimitry Ivanov [Thu, 11 Aug 2016 17:47:59 +0000 (17:47 +0000)]
Merge "linker_asan: Translate absolute dlopen paths to use asan-libraries." am:
cea35d77a2
am:
2fa91f4df8
Change-Id: I511880644c289026744ad35c2cfaf5d26e8b4a5d
Dimitry Ivanov [Thu, 11 Aug 2016 17:44:01 +0000 (17:44 +0000)]
Merge "linker_asan: Translate absolute dlopen paths to use asan-libraries."
am:
cea35d77a2
Change-Id: I54283bd5694b0480ced971d4602c91f8f18c18d7
Treehugger Robot [Thu, 11 Aug 2016 17:38:06 +0000 (17:38 +0000)]
Merge "linker_asan: Translate absolute dlopen paths to use asan-libraries."
Dimitry Ivanov [Thu, 11 Aug 2016 04:43:17 +0000 (21:43 -0700)]
Fix mistake in merge conflict resolution
This fixed mistake introduced by merge conflicts of
03ea02c to nyc-mr1-dev-plus-aosp
in
1bce83e78f16456d0f187b5d5e6c8957e93f059a
Change-Id: I1257cd7943e1935d65c109bc318144c69b56e64c
Dimitry Ivanov [Wed, 10 Aug 2016 02:38:43 +0000 (19:38 -0700)]
linker_asan: Translate absolute dlopen paths to use asan-libraries.
This patch enables absolute path translation to instrumented library
when linker_asan is in use.
Test: adb shell cat /proc/<rlid pid>/maps | grep libril-qc-qmi-1.so
check that it is mapped from /data/vendor/lib64 and not /vendor/lib64
Bug: http://b/
30320104
Change-Id: I3bc24754b192afc0a72d6f3801f7b42141ce715b
(cherry picked from commit
5aa67675f853af9588ac9274ecf86d7858695ce2)
Dimitry Ivanov [Thu, 11 Aug 2016 04:30:21 +0000 (21:30 -0700)]
resolve merge conflicts of
03ea02c to nyc-mr1-dev-plus-aosp
Change-Id: I2b757350042380b6a46f92dc0bbe0e28cb94033b
Dimitry Ivanov [Thu, 11 Aug 2016 04:22:44 +0000 (04:22 +0000)]
linker_asan: Translate absolute dlopen paths to use asan-libraries.
am:
5aa67675f8
Change-Id: I912e82324fc014dcfaaed0be57911ee4390a6355
Dimitry Ivanov [Wed, 10 Aug 2016 02:38:43 +0000 (19:38 -0700)]
linker_asan: Translate absolute dlopen paths to use asan-libraries.
This patch enables absolute path translation to instrumented library
when linker_asan is in use.
Test: adb shell cat /proc/<rlid pid>/maps | grep libril-qc-qmi-1.so
check that it is mapped from /data/vendor/lib64 and not /vendor/lib64
Bug: http://b/
30320104
Change-Id: I3bc24754b192afc0a72d6f3801f7b42141ce715b
Dan Albert [Thu, 11 Aug 2016 01:44:05 +0000 (01:44 +0000)]
Merge "Add ndk_library for libdl." am:
4519a4d182 am:
bcb80b2b18
am:
151e17a911
Change-Id: I74b13b7f15ad290221cf1fb7792e38f8cefdfc01
Dan Albert [Thu, 11 Aug 2016 01:41:05 +0000 (01:41 +0000)]
Merge "Add ndk_library for libdl." am:
4519a4d182
am:
bcb80b2b18
Change-Id: I70e822b1d056edf32dfab890c72259c211e4d77b
Josh Gao [Thu, 11 Aug 2016 01:41:05 +0000 (01:41 +0000)]
Merge "Add __attribute__((sentinel)) tags to execl and friends." am:
32a2e137a5 am:
4aa98a3d3f
am:
d370f55339
Change-Id: Id3b90308e3ad81c484035643b09cac9e55ab044a
Dan Albert [Thu, 11 Aug 2016 01:37:37 +0000 (01:37 +0000)]
Merge "Add ndk_library for libdl."
am:
4519a4d182
Change-Id: I6648c5c60d59b8002433b5157d452460d50065b5
Josh Gao [Thu, 11 Aug 2016 01:37:36 +0000 (01:37 +0000)]
Merge "Add __attribute__((sentinel)) tags to execl and friends." am:
32a2e137a5
am:
4aa98a3d3f
Change-Id: I195d8149dc82acd7deb784ca5257f506b1ec24bd
Josh Gao [Thu, 11 Aug 2016 01:35:11 +0000 (01:35 +0000)]
Merge "Add __attribute__((sentinel)) tags to execl and friends."
am:
32a2e137a5
Change-Id: I9edad7b6fa639012f6a94501a33bdbc70540cd77
Treehugger Robot [Thu, 11 Aug 2016 01:33:31 +0000 (01:33 +0000)]
Merge "Add ndk_library for libdl."
Treehugger Robot [Thu, 11 Aug 2016 01:19:23 +0000 (01:19 +0000)]
Merge "Add __attribute__((sentinel)) tags to execl and friends."
Dimitry Ivanov [Thu, 11 Aug 2016 01:09:03 +0000 (01:09 +0000)]
Merge "Check alignment along with range of mapped file fragments" am:
3e35b26704 am:
62ad07d253
am:
8fb5a65d6a
Change-Id: I202a64f6ec7707ed4b1add602a4e39e7a35e52ba
Dimitry Ivanov [Thu, 11 Aug 2016 01:07:02 +0000 (01:07 +0000)]
Merge "Check alignment along with range of mapped file fragments" am:
3e35b26704
am:
62ad07d253
Change-Id: If06c2cc778014602b229107c112388f6e9f67988
Dimitry Ivanov [Thu, 11 Aug 2016 01:03:04 +0000 (01:03 +0000)]
Merge "Check alignment along with range of mapped file fragments"
am:
3e35b26704
Change-Id: I6d81b0ca1903c466ba1420671ff700a4c0a1b0d8
Treehugger Robot [Thu, 11 Aug 2016 00:46:33 +0000 (00:46 +0000)]
Merge "Check alignment along with range of mapped file fragments"
Elliott Hughes [Thu, 11 Aug 2016 00:17:31 +0000 (00:17 +0000)]
Merge "Move brillo closer to Android." am:
299e501419 am:
fdcf8ed651
am:
335bb43cbe
Change-Id: Id8c7ee9d8d786248010107128ea52c3fbec02e91
Elliott Hughes [Thu, 11 Aug 2016 00:17:30 +0000 (00:17 +0000)]
Merge "Remove __static_cast macro from <sys/cdefs.h>." am:
18af5bfa5d am:
4fe10a4c89
am:
ed1e43bf24
Change-Id: I5a1ba1d1463b3213c04d6245f64359b002715b6d
Elliott Hughes [Thu, 11 Aug 2016 00:14:29 +0000 (00:14 +0000)]
Merge "Move brillo closer to Android." am:
299e501419
am:
fdcf8ed651
Change-Id: I05fd1e19e551d16956e558d5fd2e5a3a6b8f8ed3
Elliott Hughes [Thu, 11 Aug 2016 00:14:29 +0000 (00:14 +0000)]
Merge "Remove __static_cast macro from <sys/cdefs.h>." am:
18af5bfa5d
am:
4fe10a4c89
Change-Id: Ia700223faf6a274058721ab2fba47b1595b3e23d
Elliott Hughes [Thu, 11 Aug 2016 00:11:33 +0000 (00:11 +0000)]
Merge "Move brillo closer to Android."
am:
299e501419
Change-Id: I0a0136336bfe75532d4c37fb6242a80b293702ca
Elliott Hughes [Thu, 11 Aug 2016 00:11:31 +0000 (00:11 +0000)]
Merge "Remove __static_cast macro from <sys/cdefs.h>."
am:
18af5bfa5d
Change-Id: If2188445e057543a7bdc3530c60697197a90f623
Treehugger Robot [Wed, 10 Aug 2016 23:59:19 +0000 (23:59 +0000)]
Merge "Move brillo closer to Android."
Treehugger Robot [Wed, 10 Aug 2016 23:58:11 +0000 (23:58 +0000)]
Merge "Remove __static_cast macro from <sys/cdefs.h>."
Elliott Hughes [Wed, 10 Aug 2016 22:51:06 +0000 (15:51 -0700)]
Fix sysconf(_SC_ARG_MAX).
ARG_MAX hasn't been a constant since Linux 2.6.23.
Bug: http://lists.landley.net/pipermail/toybox-landley.net/2016-August/008592.html
Change-Id: I1eddb562751604c75b89fa610d79be0655c53693
Test: ran the bionic tests on device and against glibc
Josh Gao [Wed, 10 Aug 2016 22:18:29 +0000 (15:18 -0700)]
Add __attribute__((sentinel)) tags to execl and friends.
Give a compile time diagnostic when the nullptr sentinel is missing
from an execl family call, instead of just pulling arbitrary values.
Bug: http://b/
30793878
Change-Id: I1c49005c58b7ad4a5b04f0435b722d4c744e8f0e
Test: Built bullhead
Elliott Hughes [Wed, 10 Aug 2016 21:45:20 +0000 (21:45 +0000)]
Merge "Fortify vsnprintf in more cases." am:
af211ab23f am:
732a173505
am:
ef0d3c20c4
Change-Id: I898db96198c67b453c0d3f20902aaea7705ca080
Elliott Hughes [Wed, 10 Aug 2016 21:32:49 +0000 (21:32 +0000)]
Merge "Fortify vsnprintf in more cases." am:
af211ab23f
am:
732a173505
Change-Id: Ib53c54d15c1b29e9c22860e2503156eea909681f
Elliott Hughes [Wed, 10 Aug 2016 21:26:50 +0000 (21:26 +0000)]
Merge "Fortify vsnprintf in more cases."
am:
af211ab23f
Change-Id: Iccd96387222637d1a4c8eed4507ad8b5d21a16fb
Elliott Hughes [Wed, 10 Aug 2016 21:18:01 +0000 (14:18 -0700)]
Remove __static_cast macro from <sys/cdefs.h>.
We don't use it, and we added the more general __BIONIC_CAST anyway.
Change-Id: I2cb8a108b58bb2cb24ed2b1890d9efed671196dc
Elliott Hughes [Wed, 10 Aug 2016 21:11:09 +0000 (21:11 +0000)]
Merge "Fortify vsnprintf in more cases."
Elliott Hughes [Wed, 10 Aug 2016 21:06:14 +0000 (14:06 -0700)]
Move brillo closer to Android.
Hiding our legacy cruft seemed like a good idea, but in practice it will only
mean worse interoperability.
Plus we got it wrong, as the recent `putw` example showed.
Change-Id: I167c7168eff133889028089c22a7a0dfb8d6d0cf
Elliott Hughes [Wed, 10 Aug 2016 18:07:54 +0000 (11:07 -0700)]
Fortify vsnprintf in more cases.
Bug: http://b/
30445072
Change-Id: I1893890f0e3b56533eef053eda1bd96a0b9a5119
Dimitry Ivanov [Tue, 9 Aug 2016 00:12:18 +0000 (17:12 -0700)]
Check alignment along with range of mapped file fragments
Improve sanity-checks of elf-file by adding alignment check
of mapped sections and section headers.
Bug: http://b/
30687964
Change-Id: I7f06ddaa56a13989ce7be847b3a73c352e32c008
(cherry picked from commit
7e2d49ae3ebbae7ebf1ca033f86e87002c0dd83c)
Dimitry Ivanov [Wed, 10 Aug 2016 02:44:15 +0000 (19:44 -0700)]
resolve merge conflicts of
241a272 to nyc-mr1-dev-plus-aosp
Change-Id: I03618ad2f106cb9cdda007154a90c5dc64f9ff58
Dimitry Ivanov [Wed, 10 Aug 2016 01:56:10 +0000 (01:56 +0000)]
Check alignment along with range of mapped file fragments
am:
7e2d49ae3e
Change-Id: I542a864f944153ecd84d6502a2f9ecbd12efaef6
OSDN Git Service
