OSDN Git Service
Nick Kralevich [Tue, 4 Jun 2013 19:07:16 +0000 (12:07 -0700)]
am
a24e81ef: Merge "Add tests for __strcpy_chk()"
* commit '
a24e81efd30d106cdfa6a019acf7c77cd88b40cc':
Add tests for __strcpy_chk()
Nick Kralevich [Tue, 4 Jun 2013 19:05:33 +0000 (19:05 +0000)]
Merge "Add tests for __strcpy_chk()"
Nick Kralevich [Mon, 3 Jun 2013 17:58:06 +0000 (10:58 -0700)]
Add tests for __strcpy_chk()
Change-Id: I5675d04fcd471732c1b87b83879a54fbcd27762e
Brian Carlstrom [Tue, 4 Jun 2013 03:21:04 +0000 (20:21 -0700)]
am
06713930: Merge "Small cleanup of soinfo_elf_lookup."
* commit '
0671393072a78e75a726c58aa3ca718e55eeac3e':
Small cleanup of soinfo_elf_lookup.
Brian Carlstrom [Tue, 4 Jun 2013 03:18:23 +0000 (03:18 +0000)]
Merge "Small cleanup of soinfo_elf_lookup."
Christopher Ferris [Tue, 4 Jun 2013 00:27:49 +0000 (17:27 -0700)]
Small cleanup of soinfo_elf_lookup.
- Remove unnecessary line.
- Move declarations to first use.
Change-Id: I1d8398d6c13f7cb86bffe0b68af849e35a4b234d
Ben Cheng [Sat, 1 Jun 2013 15:19:07 +0000 (08:19 -0700)]
am
404d491e: Merge "Use bl instead of blx to support interworking properly."
* commit '
404d491eb655839bf4260cc168bb79864473e129':
Use bl instead of blx to support interworking properly.
Ben Cheng [Fri, 31 May 2013 21:40:37 +0000 (21:40 +0000)]
Merge "Use bl instead of blx to support interworking properly."
Ben Cheng [Fri, 31 May 2013 21:25:48 +0000 (14:25 -0700)]
Use bl instead of blx to support interworking properly.
(cherry picked from commit
9e1905794b4ecd8f7b87d8e4e2f954c8cfc6beda in
master)
Change-Id: I9b8c35ea9e201e00f84315f9f105013c23c94d85
Nick Kralevich [Fri, 31 May 2013 18:14:56 +0000 (11:14 -0700)]
am
8539961f: Merge "FORTIFY_SOURCE: strcat / strncat optimize"
* commit '
8539961ff299b05d8feac9be8b119698be22da03':
FORTIFY_SOURCE: strcat / strncat optimize
Nick Kralevich [Fri, 31 May 2013 18:13:23 +0000 (18:13 +0000)]
Merge "FORTIFY_SOURCE: strcat / strncat optimize"
Nick Kralevich [Thu, 30 May 2013 23:48:53 +0000 (16:48 -0700)]
FORTIFY_SOURCE: strcat / strncat optimize
__strcat_chk and __strncat_chk are slightly inefficient,
because they end up traversing over the same memory region
two times.
This change optimizes __strcat_chk / __strncat_chk so they
only access the memory once. Although I haven't benchmarked these
changes, it should improve the performance of these functions.
__strlen_chk - expose this function, even if -D_FORTIFY_SOURCE
isn't defined. This is needed to compile libc itself without
-D_FORTIFY_SOURCE.
Change-Id: Id2c70dff55a276b47c59db27a03734d659f84b74
Nick Kralevich [Thu, 30 May 2013 23:54:24 +0000 (16:54 -0700)]
am
72f59c84: Merge "Add strncpy FORTIFY_SOURCE tests."
* commit '
72f59c84fd73a0a701ce6448d103e9021c1cb060':
Add strncpy FORTIFY_SOURCE tests.
Nick Kralevich [Thu, 30 May 2013 23:54:18 +0000 (16:54 -0700)]
am
d515f468: Merge "libc x86: Remove strcat.S"
* commit '
d515f46888cf381c1fbbc99a62be727174b30a23':
libc x86: Remove strcat.S
Nick Kralevich [Thu, 30 May 2013 20:33:02 +0000 (20:33 +0000)]
Merge "Add strncpy FORTIFY_SOURCE tests."
Nick Kralevich [Thu, 30 May 2013 20:21:14 +0000 (13:21 -0700)]
Add strncpy FORTIFY_SOURCE tests.
Change-Id: Id108b1d72b44d7e5fb911268e80bbdf896808f60
Nick Kralevich [Thu, 30 May 2013 19:59:38 +0000 (19:59 +0000)]
Merge "libc x86: Remove strcat.S"
Nick Kralevich [Thu, 30 May 2013 18:15:40 +0000 (11:15 -0700)]
libc x86: Remove strcat.S
This file is never used.
Change-Id: Iae4bba4a5a12a86a775af05e7477fb7b6511480b
Nick Kralevich [Fri, 24 May 2013 18:37:30 +0000 (11:37 -0700)]
am
8d79fd1c: Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
* commit '
8d79fd1c94cb021b6852e6f44e27183ec83fe04c':
libc x86: Remove index.S, strcpy.S, strchr.S
Nick Kralevich [Fri, 24 May 2013 18:34:57 +0000 (18:34 +0000)]
Merge "libc x86: Remove index.S, strcpy.S, strchr.S"
Nick Kralevich [Fri, 24 May 2013 17:48:12 +0000 (10:48 -0700)]
libc x86: Remove index.S, strcpy.S, strchr.S
These files are never used.
Change-Id: Iab8474bdff3bd4d225597c62b3c0f0849f808818
Nick Kralevich [Fri, 24 May 2013 17:43:58 +0000 (10:43 -0700)]
am
2317275f: Merge "libc: delete x86 memchr.S"
* commit '
2317275f859a685386889139855f2f3314337d53':
libc: delete x86 memchr.S
Nick Kralevich [Fri, 24 May 2013 17:27:47 +0000 (17:27 +0000)]
Merge "libc: delete x86 memchr.S"
Nick Kralevich [Fri, 24 May 2013 15:52:04 +0000 (08:52 -0700)]
libc: delete x86 memchr.S
This file is never used.
Change-Id: Ief08ad176713b5194048852609613801969e1364
Brian Carlstrom [Wed, 22 May 2013 00:23:09 +0000 (17:23 -0700)]
am
f5f29de6: Merge "Fix bionic linker to support segments with zero p_filesz"
* commit '
f5f29de6ae5a0b74234f111b5691a1e5588671cb':
Fix bionic linker to support segments with zero p_filesz
Brian Carlstrom [Tue, 21 May 2013 23:59:52 +0000 (23:59 +0000)]
Merge "Fix bionic linker to support segments with zero p_filesz"
Brian Carlstrom [Tue, 21 May 2013 23:49:24 +0000 (16:49 -0700)]
Fix bionic linker to support segments with zero p_filesz
(cherry picked from commit
96362fb9d11beef6233aa03db396f25688e70860)
Change-Id: Ib075a6dfc45d5d0746d8b278f317dd9b8d772f2a
Erik Gilling [Thu, 16 May 2013 20:19:07 +0000 (13:19 -0700)]
am
2e317075: Merge "libc/arm: add cortex-a8 cpu variant"
* commit '
2e317075b044e94fc75e36d08bec8a7eb5fc31ae':
libc/arm: add cortex-a8 cpu variant
Erik Gilling [Thu, 16 May 2013 19:57:28 +0000 (19:57 +0000)]
Merge "libc/arm: add cortex-a8 cpu variant"
The Android Open Source Project [Thu, 16 May 2013 12:42:53 +0000 (05:42 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I0839dac295b83f3c5d53d0bb81925b44e3ec17cc
Rom Lemarchand [Fri, 3 May 2013 12:53:38 +0000 (05:53 -0700)]
libc/arm: add cortex-a8 cpu variant
Change-Id: I30e8dd6d4b2e7889aea8f5ed21182a5941bfb489
Elliott Hughes [Wed, 15 May 2013 01:10:45 +0000 (18:10 -0700)]
am
5217fb52: Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
* commit '
5217fb528ca40ece0dbb459dedf7d6fae81dde68':
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
Elliott Hughes [Wed, 15 May 2013 00:56:06 +0000 (00:56 +0000)]
Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
Elliott Hughes [Wed, 15 May 2013 00:20:34 +0000 (17:20 -0700)]
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
Change-Id: Ie16cb21c1a5a2bdce8502b5974e2c4dbb1d679ce
Elliott Hughes [Tue, 14 May 2013 23:56:49 +0000 (16:56 -0700)]
am
6f502bc7: Merge "Add more __restricts, clean up __format__ attributes."
* commit '
6f502bc74374804766639e6b1515644875810bda':
Add more __restricts, clean up __format__ attributes.
Elliott Hughes [Tue, 14 May 2013 23:45:48 +0000 (23:45 +0000)]
Merge "Add more __restricts, clean up __format__ attributes."
Elliott Hughes [Tue, 14 May 2013 23:25:49 +0000 (16:25 -0700)]
am
349ef893: Merge "Pull upstream FreeBSD revision 249810."
* commit '
349ef893e82f37632a705f39efc47c0d440f63c7':
Pull upstream FreeBSD revision 249810.
Elliott Hughes [Tue, 14 May 2013 23:08:43 +0000 (16:08 -0700)]
Add more __restricts, clean up __format__ attributes.
Change-Id: I7e2d270cc722d339d221eaea92747eaff3b51403
Elliott Hughes [Tue, 14 May 2013 23:06:33 +0000 (23:06 +0000)]
Merge "Pull upstream FreeBSD revision 249810."
Elliott Hughes [Tue, 14 May 2013 21:56:54 +0000 (14:56 -0700)]
Pull upstream FreeBSD revision 249810.
Fix license clause numbering.
Convert libc/stdio from K&R to ANSI C.
And add '__restrict' where it appeared in the header prototypes.
Change-Id: I5fdb22f79d3effa2298d03f9aa8412b4b087da04
Upstream: http://svnweb.freebsd.org/base?view=revision&revision=249810
Elliott Hughes [Tue, 14 May 2013 21:59:16 +0000 (14:59 -0700)]
am
5b7b2809: Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events"
* commit '
5b7b2809a2110dad1b2434f1070e13a08085d94b':
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
Elliott Hughes [Tue, 14 May 2013 21:59:16 +0000 (14:59 -0700)]
am
f0f4fa3f: Merge "libc: add timerfd calls"
* commit '
f0f4fa3fb1ea8623b1e1bc59f7967e0470c8e532':
libc: add timerfd calls
Elliott Hughes [Tue, 14 May 2013 21:59:15 +0000 (14:59 -0700)]
am
e1c58ab5: Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"
* commit '
e1c58ab5bb6284b3e3a2d0e54c295a93780b3f70':
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
Elliott Hughes [Tue, 14 May 2013 21:59:15 +0000 (14:59 -0700)]
am
7cb82791: Merge "libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM"
* commit '
7cb82791cada0283648fedc316171cbffda79af7':
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
Elliott Hughes [Tue, 14 May 2013 21:49:08 +0000 (21:49 +0000)]
Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events"
Todd Poynor [Thu, 9 May 2013 21:38:39 +0000 (14:38 -0700)]
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
(cherry-pick of
d1ad4f6dab06189d4d3dcfa19ae4bc301481eb3f.)
Change-Id: I4a8476bff068951533d4188de94097c8b84bc489
Elliott Hughes [Tue, 14 May 2013 21:45:29 +0000 (21:45 +0000)]
Merge "libc: add timerfd calls"
Todd Poynor [Thu, 9 May 2013 03:21:00 +0000 (20:21 -0700)]
libc: add timerfd calls
(cherry-pick of
04c0ac14a49e0969333008a9522b64046d58fbdc.)
Change-Id: I06d0b6c2a8781602362b81f48faf1cca76b9ec05
Elliott Hughes [Tue, 14 May 2013 21:44:28 +0000 (21:44 +0000)]
Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"
Todd Poynor [Sat, 11 May 2013 01:23:40 +0000 (18:23 -0700)]
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
Add CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE, and CLOCK_MONOTONIC_COARSE
as supported by recent linux kernels.
(cherry-pick of
60e5144ca312b210b54ac8e6966108da0c97ff80.)
Bug:
8895727
Change-Id: If79a4d05d1301108f49a37588f9416c4be19277a
Elliott Hughes [Tue, 14 May 2013 21:43:37 +0000 (21:43 +0000)]
Merge "libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM"
Todd Poynor [Thu, 9 May 2013 22:56:23 +0000 (15:56 -0700)]
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
(cherry-pick of
b928bda83d4413b703329f607e2706602f15293f.)
Change-Id: Ica6aad84299819ffc5e57ae4891e057d2e401fa1
Elliott Hughes [Tue, 14 May 2013 18:10:23 +0000 (11:10 -0700)]
am
d8a9cccb: Merge "Fix all printf warnings in res_send.c."
* commit '
d8a9cccb4d77eecc36425c9240a12bd305031ee3':
Fix all printf warnings in res_send.c.
Elliott Hughes [Tue, 14 May 2013 17:10:20 +0000 (17:10 +0000)]
Merge "Fix all printf warnings in res_send.c."
Kito Cheng [Sat, 11 May 2013 09:48:48 +0000 (17:48 +0800)]
Fix all printf warnings in res_send.c.
Change-Id: I4bf959140b5a5475897bd80704e64e3c4645fc3f
The Android Automerger [Mon, 13 May 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Fri, 10 May 2013 06:40:47 +0000 (23:40 -0700)]
am
738370d9: Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
* commit '
738370d9387396922c10910edb61272e585be107':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
Elliott Hughes [Fri, 10 May 2013 00:53:38 +0000 (17:53 -0700)]
am
98f7659d: Merge "Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
* commit '
98f7659d7e3a7d75c68a41299f6ee55d7d35c27b':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
Elliott Hughes [Thu, 9 May 2013 21:19:58 +0000 (14:19 -0700)]
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
The GNU dynamic linker silently ignores a DT_PREINIT_ARRAY section
in a shared library. We had ineffectual code that tried to report
an error, which I tried to fix but got wrong --- my version still
wouldn't report the error to the caller, but would prevent us from
continuing to call constructors.
Bug:
8825226
(cherry picked from commit
8147d3c284932896ab6095232b355979b9eb33d3)
Change-Id: Iad8e7e3743d1a5e6bd1d44ef40b1ab3499cb64f2
Elliott Hughes [Thu, 9 May 2013 22:30:21 +0000 (22:30 +0000)]
Merge "Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
Elliott Hughes [Thu, 9 May 2013 21:19:58 +0000 (14:19 -0700)]
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
The GNU dynamic linker silently ignores a DT_PREINIT_ARRAY section
in a shared library. We had ineffectual code that tried to report
an error, which I tried to fix but got wrong --- my version still
wouldn't report the error to the caller, but would prevent us from
continuing to call constructors.
Bug:
8825226
Change-Id: I4fd8450ecc44d8767a1cb808aeecfbfbfc77c070
Ben Cheng [Thu, 9 May 2013 16:37:50 +0000 (09:37 -0700)]
am
262b7384: Adjust PC value in ARM stack trace.
* commit '
262b7384e4e691d42070a57472ecc64cf668c480':
Adjust PC value in ARM stack trace.
Ben Cheng [Wed, 8 May 2013 20:26:12 +0000 (13:26 -0700)]
am
ff220f70: Merge "Remove a spurious FIXME and unnecessary type cast."
* commit '
ff220f70036178aa0d7dcf1cbc4825085a84441e':
Remove a spurious FIXME and unnecessary type cast.
Ben Cheng [Wed, 8 May 2013 20:26:11 +0000 (13:26 -0700)]
am
b9256ada: Merge "Adjust PC value in ARM stack trace."
* commit '
b9256adab3aa7e7628d7bbd015132a511de7a43d':
Adjust PC value in ARM stack trace.
Nick Kralevich [Wed, 8 May 2013 20:26:11 +0000 (13:26 -0700)]
am
d541ba17: Merge "Use restrict pointers for various libc functions."
* commit '
d541ba17197fd3ef1f60462e51261c4340369218':
Use restrict pointers for various libc functions.
Ben Cheng [Tue, 7 May 2013 21:22:43 +0000 (14:22 -0700)]
Adjust PC value in ARM stack trace.
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: Ie59351a0012c2267309f63f0462fdba4698846fe
Ben Cheng [Tue, 7 May 2013 23:56:11 +0000 (23:56 +0000)]
Merge "Remove a spurious FIXME and unnecessary type cast."
Ben Cheng [Tue, 7 May 2013 23:53:33 +0000 (16:53 -0700)]
Remove a spurious FIXME and unnecessary type cast.
Change-Id: I05dcefdec7f047bef7eef5c5ceb7453992d56c24
Ben Cheng [Tue, 7 May 2013 22:45:42 +0000 (22:45 +0000)]
Merge "Adjust PC value in ARM stack trace."
Ben Cheng [Tue, 7 May 2013 21:22:43 +0000 (14:22 -0700)]
Adjust PC value in ARM stack trace.
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: I804fdabfa1db4709bede222d4b432e8d42d53167
Nick Kralevich [Tue, 7 May 2013 17:37:48 +0000 (17:37 +0000)]
Merge "Use restrict pointers for various libc functions."
Nick Kralevich [Tue, 7 May 2013 17:00:21 +0000 (10:00 -0700)]
Use restrict pointers for various libc functions.
All the cool kids say this is the best thing since sliced bread.
http://cellperformance.beyond3d.com/articles/2006/05/demystifying-the-restrict-keyword.html
For the most part, these changes match what glibc does.
Change-Id: I176268f27f82800162fe5f2515b08d5469ea2dfe
Nick Kralevich [Thu, 2 May 2013 21:56:37 +0000 (14:56 -0700)]
am
b01f7afd: Merge "Use __predict_false on some fortify methods."
* commit '
b01f7afd5fd5df5f8fe925b4fe493269191b62a2':
Use __predict_false on some fortify methods.
Nick Kralevich [Thu, 2 May 2013 21:52:19 +0000 (21:52 +0000)]
Merge "Use __predict_false on some fortify methods."
Nick Kralevich [Thu, 2 May 2013 21:31:51 +0000 (14:31 -0700)]
Use __predict_false on some fortify methods.
Give the compiler some hints that these error conditions
are unlikely to occur in practice.
Change-Id: Ifaf7322a12120ef663c8315c1a18c2dcbe4bda23
Nick Kralevich [Thu, 2 May 2013 21:25:42 +0000 (14:25 -0700)]
am
e4ac8feb: Merge "libc: cleanup strchr"
* commit '
e4ac8feb58ed1f963db9a1f32fa74a06a1f594f2':
libc: cleanup strchr
Nick Kralevich [Thu, 2 May 2013 21:17:15 +0000 (21:17 +0000)]
Merge "libc: cleanup strchr"
Nick Kralevich [Fri, 19 Apr 2013 23:54:22 +0000 (16:54 -0700)]
libc: cleanup strchr
Move strchr to a .cpp file, and change to bionic directory.
Change-Id: I64ade7df326c0a9a714aca4caf5647b6833b1c97
Nick Kralevich [Wed, 1 May 2013 22:10:07 +0000 (15:10 -0700)]
am
5e3b502b: Merge "keep test names consistent with other tests."
* commit '
5e3b502b6b56634953ea152409363088974fa5e9':
keep test names consistent with other tests.
Nick Kralevich [Wed, 1 May 2013 22:10:07 +0000 (15:10 -0700)]
am
8c00c91a: Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
* commit '
8c00c91aa051f18e107466b5d8c9280a2e1fabc1':
add strrchr -D_FORTIFY_SOURCE=2 test.
Nick Kralevich [Wed, 1 May 2013 22:06:15 +0000 (22:06 +0000)]
Merge "keep test names consistent with other tests."
Nick Kralevich [Wed, 1 May 2013 22:05:01 +0000 (15:05 -0700)]
keep test names consistent with other tests.
Change-Id: I23dc4d963af40406b270af83cd17f6c8c95f1de3
Nick Kralevich [Wed, 1 May 2013 22:01:19 +0000 (22:01 +0000)]
Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
Nick Kralevich [Wed, 1 May 2013 21:55:33 +0000 (14:55 -0700)]
add strrchr -D_FORTIFY_SOURCE=2 test.
Change-Id: I1b95bb0086ae9f2f506f3cc90cee834c0ce3b1d8
Nick Kralevich [Tue, 30 Apr 2013 23:25:23 +0000 (16:25 -0700)]
am
bee0ab16: Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
* commit '
bee0ab16e47086d2f31f6f9ff41328066d5a7128':
libc: upgrade strrchr to FORTIFY_SOURCE=2
Nick Kralevich [Tue, 30 Apr 2013 23:13:04 +0000 (23:13 +0000)]
Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
Nick Kralevich [Tue, 30 Apr 2013 21:19:23 +0000 (14:19 -0700)]
libc: upgrade strrchr to FORTIFY_SOURCE=2
Change-Id: I4c34c2ce22c5092c4446dc1ab55f37604c1c223f
Nick Kralevich [Tue, 30 Apr 2013 18:56:08 +0000 (11:56 -0700)]
am
c4687130: Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
* commit '
c46871302e7bd099aaf54d91da93a2248acbf733':
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
Nick Kralevich [Tue, 30 Apr 2013 18:51:22 +0000 (18:51 +0000)]
Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
Nick Kralevich [Tue, 30 Apr 2013 18:31:35 +0000 (11:31 -0700)]
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
Upgrade the following functions:
* vsnprintf
* vsprintf
* snprintf
* fgets
* strcpy
* strcat
* strncat
* strlcpy
* strlcat
* strlen
* strchr
Change-Id: Icc036fc7f0bb317e05f7c051617887a1601271aa
Nick Kralevich [Mon, 29 Apr 2013 23:56:29 +0000 (16:56 -0700)]
am
b94b2851: Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
* commit '
b94b2851d72187cc9095864a9c99429ee62d7786':
libc: upgrade sprintf to _FORTIFY_SOURCE=2
Nick Kralevich [Mon, 29 Apr 2013 23:50:46 +0000 (23:50 +0000)]
Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
Nick Kralevich [Mon, 29 Apr 2013 23:29:37 +0000 (16:29 -0700)]
libc: upgrade sprintf to _FORTIFY_SOURCE=2
Upgrade sprintf to fortify_source level 2, to catch
additional security bugs.
Change-Id: Ibc957d65e4cb96152de84b3745a04e00fa22659e
Nick Kralevich [Mon, 29 Apr 2013 23:25:41 +0000 (16:25 -0700)]
am
382a7753: Merge "strncpy: implement _FORTIFY_SOURCE=2"
* commit '
382a7753786646483a8101f4e337f9e3a82ec852':
strncpy: implement _FORTIFY_SOURCE=2
Nick Kralevich [Mon, 29 Apr 2013 23:07:33 +0000 (23:07 +0000)]
Merge "strncpy: implement _FORTIFY_SOURCE=2"
Nick Kralevich [Mon, 29 Apr 2013 21:07:06 +0000 (14:07 -0700)]
strncpy: implement _FORTIFY_SOURCE=2
Add support for fortify source level 2 to strncpy.
This will enable detection of more areas where strncpy
is used inappropriately. For example, this would have detected
bug
8727221.
Move the fortify_source tests out of string_test.cpp, and
put it into fortify1_test.cpp.
Create a new fortify2_test.cpp file, which copies all
the tests in fortify1_test.cpp, and adds fortify_source level
2 specific tests.
Change-Id: Ica0fba531cc7d0609e4f23b8176739b13f7f7a83
Nick Kralevich [Mon, 29 Apr 2013 19:51:35 +0000 (12:51 -0700)]
am
c6dc62f0: Merge "[NETFILTER]: Fix iptables ABI breakage"
* commit '
c6dc62f09c814b9688aee83e80dcfe80cb0ef604':
[NETFILTER]: Fix iptables ABI breakage
Nick Kralevich [Mon, 29 Apr 2013 19:44:29 +0000 (19:44 +0000)]
Merge "[NETFILTER]: Fix iptables ABI breakage"
Nick Kralevich [Mon, 29 Apr 2013 19:31:01 +0000 (12:31 -0700)]
[NETFILTER]: Fix iptables ABI breakage
Pick up Linux kernel patch
2748e5dec7ca8a3804852c7c4171f9156384d15c
from 2007
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=
2748e5dec7ca8a3804852c7c4171f9156384d15c
[NETFILTER]: Fix iptables ABI breakage on (at least) CRIS
With the introduction of x_tables we accidentally broke compatibility
by defining IPT_TABLE_MAXNAMELEN to XT_FUNCTION_MAXNAMELEN instead of
XT_TABLE_MAXNAMELEN, which is two bytes larger.
On most architectures it doesn't really matter since we don't have
any tables with names that long in the kernel and the structure
layout didn't change because of alignment requirements of following
members. On CRIS however (and other architectures that don't align
data) this changed the structure layout and thus broke compatibility
with old iptables binaries.
Changing it back will break compatibility with binaries compiled
against recent kernels again, but since the breakage has only been
there for three releases this seems like the better choice.
Change-Id: Ie9552b25892109c7042b9752132dc8ebd3552dc3
Andrew Hsieh [Fri, 26 Apr 2013 04:22:26 +0000 (21:22 -0700)]
am
f7153fd1: Merge "Remove redundant space within square brackets"
* commit '
f7153fd13f469e9ba5aecbfa00fde42530ca2124':
Remove redundant space within square brackets