Skip to content

Commit b603563

Browse files
committed
Add missing symbols to android-17 libc
This affects libc.so for android-17 and 19 Symbols missing from NDK libc but present in the platform version of libc: __fgets_chk __memcpy_chk __memmove_chk __memset_chk __open_2 __openat_2 __snprintf_chk __sprintf_chk __strcat_chk __strcpy_chk __strlcat_chk __strlcpy_chk __strlen_chk __strncat_chk __strncpy_chk __vsnprintf_chk __vsprintf_chk clone # x86 only ftw getsid malloc_usable_size mlockall munlockall nftw psiginfo psignal pvalloc unshare Bug: http://b/28864994 Change-Id: I31ddaf44e2ae685d45de5ca217ba3096a3f6e5ec
1 parent 317d506 commit b603563

File tree

12 files changed

+326
-0
lines changed

12 files changed

+326
-0
lines changed

ndk/platforms/android-17/arch-arm/symbols/libc.so.functions.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ __dn_count_labels
2727
__dn_skipname
2828
__errno
2929
__fcntl64
30+
__fgets_chk
3031
__fp_nquery
3132
__fp_query
3233
__fpclassifyd
@@ -54,6 +55,9 @@ __libc_init
5455
__llseek
5556
__loc_aton
5657
__loc_ntoa
58+
__memcpy_chk
59+
__memmove_chk
60+
__memset_chk
5761
__mmap2
5862
__ns_format_ttl
5963
__ns_get16
@@ -77,7 +81,9 @@ __ns_samename
7781
__ns_skiprr
7882
__ns_sprintrr
7983
__ns_sprintrrf
84+
__open_2
8085
__openat
86+
__openat_2
8187
__p_cdname
8288
__p_cdnname
8389
__p_class
@@ -123,8 +129,17 @@ __sched_cpucount
123129
__sched_cpufree
124130
__sched_getaffinity
125131
__set_tls
132+
__snprintf_chk
133+
__sprintf_chk
126134
__stack_chk_fail
127135
__statfs64
136+
__strcat_chk
137+
__strcpy_chk
138+
__strlcat_chk
139+
__strlcpy_chk
140+
__strlen_chk
141+
__strncat_chk
142+
__strncpy_chk
128143
__sym_ntop
129144
__sym_ntos
130145
__sym_ston
@@ -139,6 +154,8 @@ __timer_delete
139154
__timer_getoverrun
140155
__timer_gettime
141156
__timer_settime
157+
__vsnprintf_chk
158+
__vsprintf_chk
142159
__waitid
143160
_exit
144161
_getlong
@@ -289,6 +306,7 @@ fts_close
289306
fts_open
290307
fts_read
291308
fts_set
309+
ftw
292310
funlockfile
293311
funopen
294312
fwide
@@ -346,6 +364,7 @@ gets
346364
getservbyname
347365
getservbyport
348366
getservent
367+
getsid
349368
getsockname
350369
getsockopt
351370
gettid
@@ -431,6 +450,7 @@ lstat
431450
madvise
432451
mallinfo
433452
malloc
453+
malloc_usable_size
434454
mbrlen
435455
mbrtowc
436456
mbsinit
@@ -456,15 +476,18 @@ mktemp
456476
mktime
457477
mktime64
458478
mlock
479+
mlockall
459480
mmap
460481
mount
461482
mprotect
462483
mrand48
463484
mremap
464485
msync
465486
munlock
487+
munlockall
466488
munmap
467489
nanosleep
490+
nftw
468491
nice
469492
nrand48
470493
nsdispatch
@@ -487,6 +510,8 @@ pread
487510
pread64
488511
printf
489512
pselect
513+
psiginfo
514+
psignal
490515
pthread_atfork
491516
pthread_attr_destroy
492517
pthread_attr_getdetachstate
@@ -574,6 +599,7 @@ pututline
574599
putw
575600
putwc
576601
putwchar
602+
pvalloc
577603
pwrite
578604
pwrite64
579605
qsort
@@ -771,6 +797,7 @@ unlink
771797
unlinkat
772798
unlockpt
773799
unsetenv
800+
unshare
774801
usleep
775802
utime
776803
utimensat

ndk/platforms/android-17/arch-arm/symbols/libc.so.versions.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ LIBC {
1717
__dn_skipname;
1818
__errno;
1919
__fcntl64; # arm x86 mips
20+
__fgets_chk;
2021
__fp_nquery;
2122
__fp_query;
2223
__fpclassifyd;
@@ -44,6 +45,9 @@ LIBC {
4445
__llseek; # arm x86 mips
4546
__loc_aton;
4647
__loc_ntoa;
48+
__memcpy_chk;
49+
__memmove_chk;
50+
__memset_chk;
4751
__mmap2; # arm x86 mips
4852
__ns_format_ttl; # arm x86 mips
4953
__ns_get16; # arm x86 mips
@@ -67,7 +71,9 @@ LIBC {
6771
__ns_skiprr; # arm x86 mips
6872
__ns_sprintrr; # arm x86 mips
6973
__ns_sprintrrf; # arm x86 mips
74+
__open_2;
7075
__openat; # arm x86 mips
76+
__openat_2;
7177
__p_cdname;
7278
__p_cdnname;
7379
__p_class;
@@ -117,9 +123,18 @@ LIBC {
117123
__sched_getaffinity; # arm x86 mips
118124
__set_tls; # arm mips
119125
__sF;
126+
__snprintf_chk;
127+
__sprintf_chk;
120128
__stack_chk_fail;
121129
__stack_chk_guard;
122130
__statfs64; # arm x86 mips
131+
__strcat_chk;
132+
__strcpy_chk;
133+
__strlcat_chk;
134+
__strlcpy_chk;
135+
__strlen_chk;
136+
__strncat_chk;
137+
__strncpy_chk;
123138
__sym_ntop;
124139
__sym_ntos;
125140
__sym_ston;
@@ -135,6 +150,8 @@ LIBC {
135150
__timer_getoverrun; # arm x86 mips
136151
__timer_gettime; # arm x86 mips
137152
__timer_settime; # arm x86 mips
153+
__vsnprintf_chk;
154+
__vsprintf_chk;
138155
__waitid; # arm x86 mips
139156
_ctype_;
140157
_exit;
@@ -289,6 +306,7 @@ LIBC {
289306
fts_open;
290307
fts_read;
291308
fts_set;
309+
ftw;
292310
funlockfile;
293311
funopen;
294312
fwide;
@@ -346,6 +364,7 @@ LIBC {
346364
getservbyname;
347365
getservbyport;
348366
getservent;
367+
getsid;
349368
getsockname;
350369
getsockopt;
351370
gettid;
@@ -431,6 +450,7 @@ LIBC {
431450
madvise;
432451
mallinfo;
433452
malloc;
453+
malloc_usable_size;
434454
mbrlen;
435455
mbrtowc;
436456
mbsinit;
@@ -456,15 +476,18 @@ LIBC {
456476
mktime;
457477
mktime64; # arm x86 mips
458478
mlock;
479+
mlockall;
459480
mmap;
460481
mount;
461482
mprotect;
462483
mrand48;
463484
mremap;
464485
msync;
465486
munlock;
487+
munlockall;
466488
munmap;
467489
nanosleep;
490+
nftw;
468491
nice;
469492
nrand48;
470493
nsdispatch;
@@ -492,6 +515,8 @@ LIBC {
492515
pread64;
493516
printf;
494517
pselect;
518+
psiginfo;
519+
psignal;
495520
pthread_atfork;
496521
pthread_attr_destroy;
497522
pthread_attr_getdetachstate;
@@ -579,6 +604,7 @@ LIBC {
579604
putw; # arm x86 mips
580605
putwc;
581606
putwchar;
607+
pvalloc; # arm x86 mips
582608
pwrite;
583609
pwrite64;
584610
qsort;
@@ -780,6 +806,7 @@ LIBC {
780806
unlinkat;
781807
unlockpt;
782808
unsetenv;
809+
unshare;
783810
usleep;
784811
utime;
785812
utimensat;

ndk/platforms/android-17/arch-mips/symbols/libc.so.functions.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ __dn_count_labels
1010
__dn_skipname
1111
__errno
1212
__fcntl64
13+
__fgets_chk
1314
__fp_nquery
1415
__fp_query
1516
__fpclassifyd
@@ -36,6 +37,9 @@ __libc_init
3637
__llseek
3738
__loc_aton
3839
__loc_ntoa
40+
__memcpy_chk
41+
__memmove_chk
42+
__memset_chk
3943
__mmap2
4044
__ns_format_ttl
4145
__ns_get16
@@ -59,7 +63,9 @@ __ns_samename
5963
__ns_skiprr
6064
__ns_sprintrr
6165
__ns_sprintrrf
66+
__open_2
6267
__openat
68+
__openat_2
6369
__p_cdname
6470
__p_cdnname
6571
__p_class
@@ -105,8 +111,17 @@ __sched_cpucount
105111
__sched_cpufree
106112
__sched_getaffinity
107113
__set_tls
114+
__snprintf_chk
115+
__sprintf_chk
108116
__stack_chk_fail
109117
__statfs64
118+
__strcat_chk
119+
__strcpy_chk
120+
__strlcat_chk
121+
__strlcpy_chk
122+
__strlen_chk
123+
__strncat_chk
124+
__strncpy_chk
110125
__sym_ntop
111126
__sym_ntos
112127
__sym_ston
@@ -121,6 +136,8 @@ __timer_delete
121136
__timer_getoverrun
122137
__timer_gettime
123138
__timer_settime
139+
__vsnprintf_chk
140+
__vsprintf_chk
124141
__waitid
125142
_exit
126143
_flush_cache
@@ -272,6 +289,7 @@ fts_close
272289
fts_open
273290
fts_read
274291
fts_set
292+
ftw
275293
funlockfile
276294
funopen
277295
fwide
@@ -329,6 +347,7 @@ gets
329347
getservbyname
330348
getservbyport
331349
getservent
350+
getsid
332351
getsockname
333352
getsockopt
334353
gettid
@@ -414,6 +433,7 @@ lstat
414433
madvise
415434
mallinfo
416435
malloc
436+
malloc_usable_size
417437
mbrlen
418438
mbrtowc
419439
mbsinit
@@ -439,15 +459,18 @@ mktemp
439459
mktime
440460
mktime64
441461
mlock
462+
mlockall
442463
mmap
443464
mount
444465
mprotect
445466
mrand48
446467
mremap
447468
msync
448469
munlock
470+
munlockall
449471
munmap
450472
nanosleep
473+
nftw
451474
nice
452475
nrand48
453476
nsdispatch
@@ -470,6 +493,8 @@ pread
470493
pread64
471494
printf
472495
pselect
496+
psiginfo
497+
psignal
473498
pthread_atfork
474499
pthread_attr_destroy
475500
pthread_attr_getdetachstate
@@ -557,6 +582,7 @@ pututline
557582
putw
558583
putwc
559584
putwchar
585+
pvalloc
560586
pwrite
561587
pwrite64
562588
qsort
@@ -754,6 +780,7 @@ unlink
754780
unlinkat
755781
unlockpt
756782
unsetenv
783+
unshare
757784
usleep
758785
utime
759786
utimensat

0 commit comments

Comments
 (0)