Elliott Hughes
3801189b58
am 7cff30c7
: am b7f0693a
: Merge "Remove bogus #include <endian.h> from <sys/stat.h>."
...
* commit '7cff30c7c67454e5b0f97c0dcc6261c73ae664c8':
Remove bogus #include <endian.h> from <sys/stat.h>.
2014-12-18 23:35:21 +00:00
Elliott Hughes
53544f5af6
am 7d4d2297
: am 8597c2b3
: Merge "Split the shared group data from the shared passwd data."
...
* commit '7d4d2297856106f132283c4e501b7210fc7b0bd8':
Split the shared group data from the shared passwd data.
2014-12-18 23:35:20 +00:00
Elliott Hughes
28bba7b488
am e14086a8
: am a9c940a6
: Merge "Fix struct stat member types for x86-64."
...
* commit 'e14086a8fc137c9900ad895556710385fc423e10':
Fix struct stat member types for x86-64.
2014-12-18 23:35:18 +00:00
Elliott Hughes
b7f0693aaa
Merge "Remove bogus #include <endian.h> from <sys/stat.h>."
2014-12-18 23:24:26 +00:00
Elliott Hughes
8597c2b3f2
Merge "Split the shared group data from the shared passwd data."
2014-12-18 23:12:45 +00:00
Elliott Hughes
0c92e8c3d1
Remove bogus #include <endian.h> from <sys/stat.h>.
...
Bug: 17062519
Change-Id: I3dc21ee8b90580f112c73c72aff5d3bec4778026
2014-12-18 15:10:19 -08:00
Elliott Hughes
1c52e6c926
Fix struct stat member types for x86-64.
...
Bug: 17062519
Change-Id: I93b1e8b1d4b6918ab7c3a985e2f7da277077375e
2014-12-18 15:03:33 -08:00
Elliott Hughes
7874f1d718
Split the shared group data from the shared passwd data.
...
Found by the toybox id(1) which calls both getpwuid(3) and getgrgid(3) before
looking at either result. The use of a shared buffer in this code meant that
even on a single thread, the data for any of the passwd functions would be
clobbered by the data for any of the group functions (or vice versa).
This might seem like an insufficient fix, but POSIX explicitly says (for
getpwnam) that the result "might be overwritten by a subsequent call to
getpwent(), getpwnam(), or getpwuid()" and likewise for other members of
that group, plus equivalent text for the group-related functions.
Change-Id: I2272f47e91f72e043fdaf7c169fa9f6978ff4370
2014-12-18 15:01:10 -08:00
Yabin Cui
858e239094
am 9a734138
: am 370a3e57
: Merge "Sync with upstream for gethnamaddr.c."
...
* commit '9a734138138fcde0a2f0935e86246b9d7ff0ccb1':
Sync with upstream for gethnamaddr.c.
2014-12-18 21:49:52 +00:00
Yabin Cui
370a3e573d
Merge "Sync with upstream for gethnamaddr.c."
2014-12-18 01:06:10 +00:00
Yabin Cui
58d33a51f3
Sync with upstream for gethnamaddr.c.
...
Bug: 18566967
Change-Id: I37e7410226b49eec67614e20b2c1d5e3e47817a5
2014-12-17 16:19:27 -08:00
Elliott Hughes
50b6dc34f1
am 48bc703a
: am 3a50b65f
: Merge "Fix <net/route.h>."
...
* commit '48bc703a3c30512f06f65f2660ed9d2841b0acce':
Fix <net/route.h>.
2014-12-16 20:35:01 +00:00
Elliott Hughes
3a50b65fd1
Merge "Fix <net/route.h>."
2014-12-16 16:53:25 +00:00
Elliott Hughes
badd7e1a58
Fix <net/route.h>.
...
Previously it couldn't be included alone. Also add a header and include guard,
and fix its siblings' include guards.
Bug: https://code.google.com/p/android/issues/detail?id=82638
Change-Id: I32139a4bda0a6b015508a2319bf4e1a1453345f2
2014-12-15 18:47:14 -08:00
Elliott Hughes
63978deca9
am 7de05306
: am 16ea2790
: Merge "Move the generic arm memcmp.S into the generic directory."
...
* commit '7de05306c6f3b3077b025d5dd3eade2f125535d5':
Move the generic arm memcmp.S into the generic directory.
2014-12-15 21:32:11 +00:00
Elliott Hughes
c45b108deb
am a2bfb531
: am ad01c983
: Merge "Remove arm assembler not referenced from any makefile."
...
* commit 'a2bfb53107a7b770e9ad93287be5745271067786':
Remove arm assembler not referenced from any makefile.
2014-12-15 19:27:20 +00:00
Elliott Hughes
1ef6ec40e1
Move the generic arm memcmp.S into the generic directory.
...
Change-Id: I48e4d14a0dcddbb246edbac6d0329619574ab44d
2014-12-15 11:06:34 -08:00
Elliott Hughes
f92cc30571
Remove arm assembler not referenced from any makefile.
...
I also suspect that libc/arch-arm/bionic/memcmp.S is supposed to like in the
generic directory these days, but this change just removes dead code.
Change-Id: I9072488df6e9b7261d79b6014914a0e937cb387b
2014-12-14 17:52:32 -08:00
Yabin Cui
bb3579f878
am 96cd50f2
: am 0e32e39d
: Merge "Fix pthread key num calculation."
...
* commit '96cd50f2fc33b0d342f1733894b06fd59a725519':
Fix pthread key num calculation.
2014-12-13 03:03:51 +00:00
Yabin Cui
0e32e39df0
Merge "Fix pthread key num calculation."
2014-12-13 02:51:27 +00:00
Yabin Cui
6c238f2926
Fix pthread key num calculation.
...
Bug: 18723085
Change-Id: Iba2c834b350e4cdba0b2d771b221560a3e5df952
2014-12-12 17:00:08 -08:00
Elliott Hughes
1fc1c89810
am 7dc71bb9
: am 732d65c1
: Merge "[MIPS] Add sgidefs.h for mips64"
...
* commit '7dc71bb9d5f73dc2ffe6e070efe29e69b88c14a7':
[MIPS] Add sgidefs.h for mips64
2014-12-13 00:41:40 +00:00
Elliott Hughes
732d65c1b1
Merge "[MIPS] Add sgidefs.h for mips64"
2014-12-13 00:28:57 +00:00
Duane Sand
50a3c6949b
[MIPS] Add sgidefs.h for mips64
...
Sgidefs.h is needed by strace.
Replaced now-duplicate arch-mips64/include directory
by symlink to arch-mips/include.
Change-Id: I7808602cfa452eca3ffbdb94903f4c5bdb33efa3
2014-12-12 16:25:36 -08:00
Christopher Ferris
887a9a485c
am 3b811c81
: am 3115b34c
: Merge "fix runtime issues for scripts"
...
* commit '3b811c814e4ebe6591992141040ba5997a12407a':
fix runtime issues for scripts
2014-12-11 18:55:56 +00:00
Elliott Hughes
a70d54786f
am 1dff030e
: am e7b8bc4e
: Merge "Clean up DNS proxying."
...
* commit '1dff030e6eb527eeb4e7ed163cf19641fdb3872b':
Clean up DNS proxying.
2014-12-11 18:55:55 +00:00
Christopher Ferris
3115b34c92
Merge "fix runtime issues for scripts"
2014-12-11 18:32:00 +00:00
Elliott Hughes
9773fa3ffd
Clean up DNS proxying.
...
Remove code duplication and fall back to trying directly if the proxy
isn't available. With this, tests still work if netd is dead (perhaps
because you've run "adb shell stop", or because you're running on the host).
Bug: 18547878
Change-Id: Ia4a9aa18b1fc79e09735107246989fa7fc6c8455
2014-12-10 17:14:02 -08:00
Christopher Ferris
4173ebb42a
am ca5edfb2
: am fec60529
: Merge "Fix missing symbol for debug malloc."
...
* commit 'ca5edfb23ba45176d1e33fba6f38e7834ef33301':
Fix missing symbol for debug malloc.
2014-12-10 20:45:10 +00:00
Christopher Ferris
fec605294e
Merge "Fix missing symbol for debug malloc."
2014-12-10 20:33:52 +00:00
Elliott Hughes
1fd915b9c1
am fa465353
: am a53c504e
: Merge "Fix arm64 clone stack handling."
...
* commit 'fa46535316a514e1335836bf065c2deddab1c4f3':
Fix arm64 clone stack handling.
2014-12-10 19:58:04 +00:00
Elliott Hughes
a53c504e0c
Merge "Fix arm64 clone stack handling."
2014-12-10 19:45:48 +00:00
Yabin Cui
b9f67dc0f5
am 1eaf80d6
: am 3337435e
: Merge "Use machine/timespec.h to separate timespec definition."
...
* commit '1eaf80d6805352cb74a4ffb392da4bfd17f4caed':
Use machine/timespec.h to separate timespec definition.
2014-12-10 19:42:15 +00:00
Yabin Cui
3337435ec8
Merge "Use machine/timespec.h to separate timespec definition."
2014-12-10 19:29:24 +00:00
Christopher Ferris
3f61f89b55
Fix missing symbol for debug malloc.
...
Bug: 18686270
Change-Id: I800a6f0940060218413df652d74aca91f6a339f8
2014-12-10 11:10:00 -08:00
Elliott Hughes
51f5d83237
Fix arm64 clone stack handling.
...
Make sure we adjust the stack pointer so a signal can't overwrite data.
Bug: 15195265
Change-Id: I5ab9469a82cb214c32f40a713268a1ab74a4c6fa
2014-12-10 11:08:47 -08:00
Elliott Hughes
114cee8c6e
am 0eaa218c
: am 0952a554
: Merge "Use the stmdb instead of str to save the fn/arg"
...
* commit '0eaa218c2f567af3ed51ac7538ef9179a9318821':
Use the stmdb instead of str to save the fn/arg
2014-12-10 19:07:36 +00:00
Elliott Hughes
0952a5540e
Merge "Use the stmdb instead of str to save the fn/arg"
2014-12-10 18:53:48 +00:00
Jiangli Yuan
c3d1728583
Use the stmdb instead of str to save the fn/arg
...
Directly save data into stack without properly adjustment
of stack point is dangous. For example, if a signal comes,
kernel will put sigframe into userspace's stack, which
will overwrite the saved data if sp is not adjusted properly.
Bug: 15195265
Change-Id: Iea0cadfd3b94d50cf40252ad52fe5950811b9192
Signed-off-by: Jiangli Yuan <a6808c@motorola.com>
2014-12-10 18:47:01 +00:00
Kyunam Jo
fa343e630d
fix runtime issues for scripts
...
now, some script to update kernel-headers is not working.
because of wrong variable value and test codes.
so this issue is fixed.
Change-Id: Iffae9607858cc3c1c58fa24244be217b5a1ab06e
2014-12-10 07:53:07 +00:00
Yabin Cui
db49903732
Use machine/timespec.h to separate timespec definition.
...
Bug: 18627763
Change-Id: Ib1c406320f0ecc3705d19183a48f986cdf57c279
2014-12-10 06:36:11 +00:00
Elliott Hughes
f9ee804513
am 18779983
: am 6a684524
: Merge "Fix ptsname(3) and ttyname(3) to use TLS."
...
* commit '187799839d317b3a6ee0f32a70a19ce64d41fac5':
Fix ptsname(3) and ttyname(3) to use TLS.
2014-12-10 04:52:18 +00:00
Elliott Hughes
1f8812b2aa
am 938c251e
: am 3592743f
: Merge "Move BSD stuff together in <sys/endian.h>."
...
* commit '938c251e94cd6f38433ca5f6a1480cbaef2783d1':
Move BSD stuff together in <sys/endian.h>.
2014-12-10 04:31:18 +00:00
Elliott Hughes
a381fe8ebc
Fix ptsname(3) and ttyname(3) to use TLS.
...
Be safe by default.
Change-Id: I6c4a3f1fd4eee3a651b3162ce95b7e873de57521
2014-12-09 20:30:23 -08:00
Elliott Hughes
824f914cae
Move BSD stuff together in <sys/endian.h>.
...
Change-Id: I8bb511840f3cd98d5008034e405d82e923bd3203
2014-12-09 19:44:42 -08:00
Elliott Hughes
d0ee182bcf
am 4beb28d4
: am 3f1c604c
: Merge "<net/route.h> should include IPv6 too."
...
* commit '4beb28d427a61111e53b12cb78c39599ea1afd7b':
<net/route.h> should include IPv6 too.
2014-12-09 23:29:19 +00:00
Elliott Hughes
0098f245cf
am 92fd1774
: am 7381e145
: Merge "Sync <net/if_types.h> with upstream."
...
* commit '92fd17748376523e212dae0e606522b67d2c2883':
Sync <net/if_types.h> with upstream.
2014-12-09 23:20:59 +00:00
Elliott Hughes
a7feda3731
<net/route.h> should include IPv6 too.
...
Change-Id: I866097d8468aa8f326117d072444ebbc2a690719
2014-12-09 15:08:24 -08:00
Elliott Hughes
1ec05b7c78
Sync <net/if_types.h> with upstream.
...
Change-Id: I2c2ca47f5a21b78754c03deb3e9467ab79d9d033
2014-12-09 15:03:51 -08:00
Yabin Cui
c5132eb361
am e0601bd4
: am 94926f8c
: Merge "support _POSIX_REALTIME_SIGNALS"
...
* commit 'e0601bd49f04e5f248be4ebd976f73b1cb0b5023':
support _POSIX_REALTIME_SIGNALS
2014-12-09 22:10:11 +00:00