Commit Graph

7661 Commits

Author SHA1 Message Date
Calin Juravle
85c5202a64 Fix broken pointer overflow check ns_name_unpack()
Many compilers may optimize away the overflow check `msg + l < msg',
where `msg' is a pointer and `l' is an integer, because pointer
overflow is undefined behavior in C.

Use a safe precondition test `l >= eom - msg' instead.
Bug: 13219633

Change-Id: I3fca2125834073cc36d7e9c4e586e97842265a59
2014-03-06 18:39:29 +00:00
Calin Juravle
fcb502e3ec Sync up nameser with upstream(2014.03.05)
Bug: 13219633

Change-Id: I8ee4ddf270710e9eea415fa3db984af7719a8dd4
2014-03-06 18:36:43 +00:00
Mark Salyzyn
bbcd3c686e am a6bd876e: am 68a651e7: Merge "libc: libc_logging 64bit compile issue"
* commit 'a6bd876e3dffedb2227dde034328987ebb79223b':
  libc: libc_logging 64bit compile issue
2014-03-06 02:50:44 +00:00
Mark Salyzyn
a6bd876e3d am 68a651e7: Merge "libc: libc_logging 64bit compile issue"
* commit '68a651e7162b922a2916da524ef9706276640752':
  libc: libc_logging 64bit compile issue
2014-03-06 01:08:55 +00:00
Mark Salyzyn
68a651e716 Merge "libc: libc_logging 64bit compile issue" 2014-03-06 01:01:18 +00:00
Mark Salyzyn
9fc76027f3 libc: libc_logging 64bit compile issue
- user space logger wire format for time

Change-Id: I4840653e3a6ae151a02584311d1227d2fe536d0f
2014-03-05 16:59:39 -08:00
Robert Greenwalt
336801367b am 320765f4: am 8b6a9651: am c5443e6e: am abf91850: Merge "Fix dns searchdomain use in gethostbyname." into klp-dev
* commit '320765f44e2d20b4b9542c13fb3358a0ea2caef3':
  Fix dns searchdomain use in gethostbyname.
2014-03-06 00:14:42 +00:00
Robert Greenwalt
320765f44e am 8b6a9651: am c5443e6e: am abf91850: Merge "Fix dns searchdomain use in gethostbyname." into klp-dev
* commit '8b6a965150b955393e46572c79d69577f0425a30':
  Fix dns searchdomain use in gethostbyname.
2014-03-05 22:21:24 +00:00
Robert Greenwalt
8b6a965150 am c5443e6e: am abf91850: Merge "Fix dns searchdomain use in gethostbyname." into klp-dev
* commit 'c5443e6e516921bdb1862b85a52b873523427bea':
  Fix dns searchdomain use in gethostbyname.
2014-03-05 22:14:48 +00:00
Robert Greenwalt
c5443e6e51 am abf91850: Merge "Fix dns searchdomain use in gethostbyname." into klp-dev
* commit 'abf91850f96858a286de268267ca5cf337ec9a3b':
  Fix dns searchdomain use in gethostbyname.
2014-03-05 18:35:18 +00:00
Robert Greenwalt
abf91850f9 Merge "Fix dns searchdomain use in gethostbyname." into klp-dev 2014-03-05 18:26:27 +00:00
Narayan Kamath
ffce5ede0b am 4e53c59d: am 48d145c1: Merge "Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC."
* commit '4e53c59db205bcb991000bf540241eb5d3b99bef':
  Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC.
2014-03-05 13:31:12 +00:00
Narayan Kamath
4e53c59db2 am 48d145c1: Merge "Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC."
* commit '48d145c1ced299525ca766afd2aa34725bef5301':
  Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC.
2014-03-05 13:24:32 +00:00
Narayan Kamath
48d145c1ce Merge "Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC." 2014-03-05 13:19:21 +00:00
Narayan Kamath
252ee1e112 Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC.
No code is using this definition.

Change-Id: I188db63f38d62baf1cb57d0a36fcda540ad98492
2014-03-05 13:19:10 +00:00
Halton Huo
f0870c3bfe Fix some pthread symbols build as C++ symbol under x64 lunch.
Functions protected with !defined(__LP64__) will be get build as C++
symbols for X64 build. This is not the desired work. So protect the
implementation with !defined(__LP64__) as well.

Change-Id: I4ef50ec36e46289ab308063e24f6c5ac61a6ca8d
2014-03-05 16:34:20 +08:00
Elliott Hughes
636bcf0f69 am 614f7626: am bef50164: Merge "Remove dead NULL checks from pthread code."
* commit '614f7626fc5dcf5c0cff2c49799f2659524d3ad3':
  Remove dead NULL checks from pthread code.
2014-03-04 19:16:08 +00:00
Elliott Hughes
614f7626fc am bef50164: Merge "Remove dead NULL checks from pthread code."
* commit 'bef5016491eed41521f514d5c5528e2274689948':
  Remove dead NULL checks from pthread code.
2014-03-04 19:10:24 +00:00
Elliott Hughes
bef5016491 Merge "Remove dead NULL checks from pthread code." 2014-03-04 19:04:19 +00:00
Elliott Hughes
39b644a0e2 Remove dead NULL checks from pthread code.
GCC is removing these checks anyway because it knows the arguments
must be non-null, so leaving this code around is just confusing.

We know from experience that people were shipping code with locking
bugs because they weren't checking for error returns. Failing hard
like glibc does seems the better choice. (And it's what the checked
in code was already doing; this patch doesn't change that. It just
makes it more obvious that that's what's going on.)

Change-Id: I167c6d7c0a296822baf0cb9b43b97821eba7ab35
2014-03-04 10:55:39 -08:00
Elliott Hughes
43b9169ffb am 17ef5653: am a0bf9bde: Merge "Implement POSIX pthread_mutex_timedlock."
* commit '17ef5653dd8aa92176e90964c95a02ccf4809695':
  Implement POSIX pthread_mutex_timedlock.
2014-03-04 18:50:35 +00:00
Elliott Hughes
17ef5653dd am a0bf9bde: Merge "Implement POSIX pthread_mutex_timedlock."
* commit 'a0bf9bdea24164db96ec1d5dfa2cd327942671b6':
  Implement POSIX pthread_mutex_timedlock.
2014-03-04 18:45:18 +00:00
Elliott Hughes
a0bf9bdea2 Merge "Implement POSIX pthread_mutex_timedlock." 2014-03-04 18:39:08 +00:00
Elliott Hughes
29309d30ed am a934a901: am e365f284: am f27cc051: am 806f3bd7: Upgrade to tzdata2013i.
* commit 'a934a9019efeb2630bfac92ad186c3db4a525735':
  Upgrade to tzdata2013i.
2014-03-04 18:35:33 +00:00
Elliott Hughes
a934a9019e am e365f284: am f27cc051: am 806f3bd7: Upgrade to tzdata2013i.
* commit 'e365f2840f20bb6b7fdd044c9515018b2d4cd309':
  Upgrade to tzdata2013i.
2014-03-04 18:29:22 +00:00
Elliott Hughes
0e714a5b41 Implement POSIX pthread_mutex_timedlock.
This replaces the non-standard pthread_mutex_lock_timeout_np, which we have
to keep around on LP32 for binary compatibility.

Change-Id: I098dc7cd38369f0c1bec1fac35687fbd27392e00
2014-03-04 10:27:58 -08:00
Elliott Hughes
e365f2840f am f27cc051: am 806f3bd7: Upgrade to tzdata2013i.
* commit 'f27cc051ec36809a64f8cc6a17fd39eca3516d1d':
  Upgrade to tzdata2013i.
2014-03-04 18:26:11 +00:00
Elliott Hughes
f27cc051ec am 806f3bd7: Upgrade to tzdata2013i.
* commit '806f3bd7aaec5b7444b1b218b69b3952386cb92f':
  Upgrade to tzdata2013i.
2014-03-04 18:22:45 +00:00
Calin Juravle
631d309268 am 0c8d3b35: am 8e541b12: Merge "Moved nameser.h and namser_compat.h to public include dir"
* commit '0c8d3b35c6eb07384b0176ab3d1d462bad996e06':
  Moved nameser.h and namser_compat.h to public include dir
2014-03-04 18:04:44 +00:00
Calin Juravle
0c8d3b35c6 am 8e541b12: Merge "Moved nameser.h and namser_compat.h to public include dir"
* commit '8e541b12237f597c186820b9e18b059b620bef54':
  Moved nameser.h and namser_compat.h to public include dir
2014-03-04 17:58:52 +00:00
Calin Juravle
3f6229cf32 am cc0948d8: am 4a46a689: Merge "Moved private dns header to their own dir."
* commit 'cc0948d86a50a1b2441552cd0f357ca040855928':
  Moved private dns header to their own dir.
2014-03-04 17:55:59 +00:00
Calin Juravle
ff4dfd26a8 am 8121d264: am 9f2d1bcd: Merge "Renamed the misleading libc/netbsd directory to libc/dns."
* commit '8121d264bc58c6d97edae23981d2646b05fcdf83':
  Renamed the misleading libc/netbsd directory to libc/dns.
2014-03-04 17:55:58 +00:00
Calin Juravle
8e541b1223 Merge "Moved nameser.h and namser_compat.h to public include dir" 2014-03-04 17:53:19 +00:00
Calin Juravle
cc0948d86a am 4a46a689: Merge "Moved private dns header to their own dir."
* commit '4a46a68942d180e28c3e87f08359351245b220b7':
  Moved private dns header to their own dir.
2014-03-04 17:19:13 +00:00
Calin Juravle
8121d264bc am 9f2d1bcd: Merge "Renamed the misleading libc/netbsd directory to libc/dns."
* commit '9f2d1bcd176cb4a6f2bc0cae3f3c786444383476':
  Renamed the misleading libc/netbsd directory to libc/dns.
2014-03-04 17:19:13 +00:00
Narayan Kamath
b863c9574e am 3f985d31: am caaae7f2: Merge "Implement pthread_condattr_{get,set}clock."
* commit '3f985d31b6fc3fd61f76b71aa05c3c69d853452a':
  Implement pthread_condattr_{get,set}clock.
2014-03-04 16:05:46 +00:00
Calin Juravle
569fb9887d Moved nameser.h and namser_compat.h to public include dir
This is part of the upstream sync (Net/Open/Free BSDs expose the
nameser.h in their public headers).

Change-Id: Ib063d4e50586748cc70201a8296cd90d2e48bbcf
2014-03-04 15:07:07 +00:00
Calin Juravle
4a46a68942 Merge "Moved private dns header to their own dir." 2014-03-04 14:25:51 +00:00
Calin Juravle
9f2d1bcd17 Merge "Renamed the misleading libc/netbsd directory to libc/dns." 2014-03-04 14:25:30 +00:00
Narayan Kamath
3f985d31b6 am caaae7f2: Merge "Implement pthread_condattr_{get,set}clock."
* commit 'caaae7f2e9a89df1514ba06d13e9eb5a0f04e94c':
  Implement pthread_condattr_{get,set}clock.
2014-03-04 13:41:52 +00:00
Narayan Kamath
caaae7f2e9 Merge "Implement pthread_condattr_{get,set}clock." 2014-03-04 13:37:07 +00:00
Narayan Kamath
51e6cb33e3 Implement pthread_condattr_{get,set}clock.
We only support CLOCK_REALTIME and CLOCK_MONOTONIC for now,
so we us a single bit from pthread_cond_t->value to denote
the clock type. Note that this reduces the width of the counter
to 30 bits, but this should be large enough for all practical
purposes.

bug: 13232338

Change-Id: I857e7da64b3ecbb23eeac7c9f3fbd460f60231bd
2014-03-04 11:17:13 +00:00
Elliott Hughes
010d090241 am fea778b3: am 2c7c79e6: Merge "Switch to upstream alarm(3)."
* commit 'fea778b308be2dd0d75bd757129c3ef62ace3a61':
  Switch to upstream alarm(3).
2014-03-04 01:11:01 +00:00
Elliott Hughes
fea778b308 am 2c7c79e6: Merge "Switch to upstream alarm(3)."
* commit '2c7c79e6e5e730553281b6d42e734ee2c532a660':
  Switch to upstream alarm(3).
2014-03-04 01:04:22 +00:00
Elliott Hughes
2c7c79e6e5 Merge "Switch to upstream alarm(3)." 2014-03-04 00:58:53 +00:00
Elliott Hughes
aedb00d04e Switch to upstream alarm(3).
The only way the setitimer call can fail is if the unsigned number of seconds is
too large to fit in the kernel's signed number of seconds. If you schedule a
68-year alarm, glibc will fail by returning 0 and BSD will fail by returning -1.

Change-Id: Ic3721b01428f5402d99f31fd7f2ba2cc58805607
2014-03-04 00:58:31 +00:00
Mark Salyzyn
4fc7758e6f am 337815ff: am f33df6a6: Merge "libc: Make calls to new user-space logger (revisit)"
* commit '337815ffa2d4c899bf3c2b9798cb90665b497cea':
  libc: Make calls to new user-space logger (revisit)
2014-03-03 21:18:08 +00:00
Mark Salyzyn
337815ffa2 am f33df6a6: Merge "libc: Make calls to new user-space logger (revisit)"
* commit 'f33df6a662934cd72a79195773d2745ae8f937d4':
  libc: Make calls to new user-space logger (revisit)
2014-03-03 21:12:03 +00:00
Mark Salyzyn
f33df6a662 Merge "libc: Make calls to new user-space logger (revisit)" 2014-03-03 21:05:19 +00:00
Elliott Hughes
1eb606df0a am 46215a8b: am dfeb42ed: Merge "If the kernel doesn\'t have MADV_MERGEABLE, stop asking for it."
* commit '46215a8b53e149de3fc28600c2b2eebe66d36716':
  If the kernel doesn't have MADV_MERGEABLE, stop asking for it.
2014-03-03 20:55:35 +00:00