Nick Kralevich
f0c9683e17
am c9757ac8
: am b01f7afd
: Merge "Use __predict_false on some fortify methods."
...
* commit 'c9757ac81eb48f9cfee0ba7833fed8a3363ecee2':
Use __predict_false on some fortify methods.
2013-05-02 15:00:41 -07:00
Nick Kralevich
c9757ac81e
am b01f7afd
: Merge "Use __predict_false on some fortify methods."
...
* commit 'b01f7afd5fd5df5f8fe925b4fe493269191b62a2':
Use __predict_false on some fortify methods.
2013-05-02 14:56:37 -07:00
Nick Kralevich
532d6f09b1
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
2013-05-02 14:31:51 -07:00
Nick Kralevich
137a9ad176
am 4f614a70
: am e4ac8feb
: Merge "libc: cleanup strchr"
...
* commit '4f614a7036b37480695884a4be3f3fe70188cd60':
libc: cleanup strchr
2013-05-02 14:28:18 -07:00
Nick Kralevich
4f614a7036
am e4ac8feb
: Merge "libc: cleanup strchr"
...
* commit 'e4ac8feb58ed1f963db9a1f32fa74a06a1f594f2':
libc: cleanup strchr
2013-05-02 14:25:42 -07:00
Nick Kralevich
4f40e511b0
libc: cleanup strchr
...
Move strchr to a .cpp file, and change to bionic directory.
Change-Id: I64ade7df326c0a9a714aca4caf5647b6833b1c97
2013-05-02 13:58:03 -07:00
Nick Kralevich
6c6949fc00
am 8355ab55
: am bee0ab16
: Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
...
* commit '8355ab5524557da2737ea9084a8131c1015ae14f':
libc: upgrade strrchr to FORTIFY_SOURCE=2
2013-04-30 16:30:20 -07:00
Nick Kralevich
8355ab5524
am bee0ab16
: Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
...
* commit 'bee0ab16e47086d2f31f6f9ff41328066d5a7128':
libc: upgrade strrchr to FORTIFY_SOURCE=2
2013-04-30 16:25:23 -07:00
Nick Kralevich
3b2e6bc9ac
libc: upgrade strrchr to FORTIFY_SOURCE=2
...
Change-Id: I4c34c2ce22c5092c4446dc1ab55f37604c1c223f
2013-04-30 14:19:23 -07:00
Nick Kralevich
c9bf778112
am 2ff94a09
: am c4687130
: Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
...
* commit '2ff94a096427a5b5e729ae356c98463c9a9dabf1':
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
2013-04-30 11:57:22 -07:00
Nick Kralevich
2ff94a0964
am c4687130
: Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
...
* commit 'c46871302e7bd099aaf54d91da93a2248acbf733':
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
2013-04-30 11:56:08 -07:00
Nick Kralevich
9020fd503c
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
2013-04-30 11:31:35 -07:00
Nick Kralevich
d411fbd497
am aed0c3ac
: am b94b2851
: Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
...
* commit 'aed0c3ac54fa944b1f8512938277e7dc6b6fa2ee':
libc: upgrade sprintf to _FORTIFY_SOURCE=2
2013-04-30 08:54:30 -07:00
Nick Kralevich
90a293f7d3
am 56a1b492
: am 382a7753
: Merge "strncpy: implement _FORTIFY_SOURCE=2"
...
* commit '56a1b492c40b51204ad1b46a6b46819775c8912a':
strncpy: implement _FORTIFY_SOURCE=2
2013-04-30 08:54:28 -07:00
Nick Kralevich
780cf25bf4
am 89357dc7
: am c6dc62f0
: Merge "[NETFILTER]: Fix iptables ABI breakage"
...
* commit '89357dc730f6bfd532c4aed80373c84904cc3319':
[NETFILTER]: Fix iptables ABI breakage
2013-04-30 08:46:47 -07:00
Nick Kralevich
aed0c3ac54
am b94b2851
: Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
...
* commit 'b94b2851d72187cc9095864a9c99429ee62d7786':
libc: upgrade sprintf to _FORTIFY_SOURCE=2
2013-04-29 16:56:29 -07:00
Nick Kralevich
78d6d9888c
libc: upgrade sprintf to _FORTIFY_SOURCE=2
...
Upgrade sprintf to fortify_source level 2, to catch
additional security bugs.
Change-Id: Ibc957d65e4cb96152de84b3745a04e00fa22659e
2013-04-29 16:41:54 -07:00
Nick Kralevich
56a1b492c4
am 382a7753
: Merge "strncpy: implement _FORTIFY_SOURCE=2"
...
* commit '382a7753786646483a8101f4e337f9e3a82ec852':
strncpy: implement _FORTIFY_SOURCE=2
2013-04-29 16:25:41 -07:00
Nick Kralevich
1aae9bd170
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
2013-04-29 15:22:10 -07:00
Nick Kralevich
89357dc730
am c6dc62f0
: Merge "[NETFILTER]: Fix iptables ABI breakage"
...
* commit 'c6dc62f09c814b9688aee83e80dcfe80cb0ef604':
[NETFILTER]: Fix iptables ABI breakage
2013-04-29 12:51:35 -07:00
Nick Kralevich
c6dc62f09c
Merge "[NETFILTER]: Fix iptables ABI breakage"
2013-04-29 19:44:30 +00:00
Nick Kralevich
e66ad7809e
[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
2013-04-29 12:31:01 -07:00
Andrew Hsieh
cfb0b8bd5e
am 83966db8
: am f7153fd1
: Merge "Remove redundant space within square brackets"
...
* commit '83966db80b9cccc3417db7566242d30a330cde29':
Remove redundant space within square brackets
2013-04-25 21:26:46 -07:00
Andrew Hsieh
83966db80b
am f7153fd1
: Merge "Remove redundant space within square brackets"
...
* commit 'f7153fd13f469e9ba5aecbfa00fde42530ca2124':
Remove redundant space within square brackets
2013-04-25 21:22:26 -07:00
Elliott Hughes
b03dc7cfa3
am 9aa57e09
: am 9ff1ffd8
: Merge "Improve diagnostics in the face of bad tzdata."
...
* commit '9aa57e09ef7234b6d82ffa4a4889508e64e424b9':
Improve diagnostics in the face of bad tzdata.
2013-04-25 21:19:48 -07:00
Andrew Hsieh
f7153fd13f
Merge "Remove redundant space within square brackets"
2013-04-26 01:54:38 +00:00
Elliott Hughes
9aa57e09ef
am 9ff1ffd8
: Merge "Improve diagnostics in the face of bad tzdata."
...
* commit '9ff1ffd805b57160079f42d7eea051c63e0e2bca':
Improve diagnostics in the face of bad tzdata.
2013-04-25 17:01:42 -07:00
Elliott Hughes
e7aaad8b83
Improve diagnostics in the face of bad tzdata.
...
Bug: 8373554
Change-Id: If8df5e956105e01cce95221ff0a7fa9d2b474db3
2013-04-25 14:02:59 -07:00
Andrew Hsieh
e8f46e8edd
Remove redundant space within square brackets
...
The new "as" in binutils-2.23 (with gcc4.8) is more picky:
it expects register right after [
Change-Id: I876124841582070ab2083ffafe38bc333b5812d0
2013-04-25 15:05:03 +08:00
Elliott Hughes
537e1aa9c6
am b6e895e8
: am 87efcd2e
: Merge "Don\'t avoid IPv6 when looking for new tzdata."
...
* commit 'b6e895e80f96301b3921a2ec7327c337ab988b41':
Don't avoid IPv6 when looking for new tzdata.
2013-04-24 11:01:28 -07:00
Elliott Hughes
b6e895e80f
am 87efcd2e
: Merge "Don\'t avoid IPv6 when looking for new tzdata."
...
* commit '87efcd2e63c9f218f476ef88f21e660f9bce633f':
Don't avoid IPv6 when looking for new tzdata.
2013-04-24 10:58:37 -07:00
Elliott Hughes
85aeb49144
Don't avoid IPv6 when looking for new tzdata.
...
Our internal IPv6 FTP networking problems have been fixed.
Change-Id: I9949a13fa20a3b0f3845e565e1461320078d3f14
2013-04-24 10:50:45 -07:00
Elliott Hughes
14cbb15b99
am 41dcafc2
: am c705daa0
: Merge "Disable IPv6 when looking for tzdata updates."
...
* commit '41dcafc27627dbc79e492056799b3cde4056d412':
Disable IPv6 when looking for tzdata updates.
2013-04-22 16:57:46 -07:00
Elliott Hughes
41dcafc276
am c705daa0
: Merge "Disable IPv6 when looking for tzdata updates."
...
* commit 'c705daa0a2684d31b8ddc9230e7aa5573880adef':
Disable IPv6 when looking for tzdata updates.
2013-04-22 16:55:59 -07:00
Elliott Hughes
21da42ea91
Disable IPv6 when looking for tzdata updates.
...
My problems connecting to ftp.iana.org are only via IPv6.
Change-Id: I42e4bae7981ec4b64822f745a7a15544d77ef22d
2013-04-22 13:44:50 -07:00
Elliott Hughes
dd15d3cb28
am dc7e8b89
: am 2c60c18c
: Merge "Upgrade to tzdata2013c."
...
* commit 'dc7e8b892db0e997c12a6574ee2468cb3f8a6a2c':
Upgrade to tzdata2013c.
2013-04-22 12:29:42 -07:00
Elliott Hughes
dc7e8b892d
am 2c60c18c
: Merge "Upgrade to tzdata2013c."
...
* commit '2c60c18c505491631a07380f80438fafa80d39f0':
Upgrade to tzdata2013c.
2013-04-22 12:27:17 -07:00
Elliott Hughes
6180ab7850
am 4f89ab31
: am bda2fb5e
: Merge "Add signature checking to HTTP tzdata updates."
...
* commit '4f89ab3166586378d448ca8d5eb4688ab33bb28b':
Add signature checking to HTTP tzdata updates.
2013-04-22 12:14:04 -07:00
Elliott Hughes
4f89ab3166
am bda2fb5e
: Merge "Add signature checking to HTTP tzdata updates."
...
* commit 'bda2fb5efab914e8442ec9c38961b7182ac5978c':
Add signature checking to HTTP tzdata updates.
2013-04-22 12:11:48 -07:00
Elliott Hughes
2c60c18c50
Merge "Upgrade to tzdata2013c."
2013-04-22 19:10:08 +00:00
Elliott Hughes
676e66db25
Add signature checking to HTTP tzdata updates.
...
Change-Id: Idcfd217eb215d6a170e6884be8d8ad28cd4fe70d
2013-04-22 11:41:57 -07:00
Elliott Hughes
652c68c50e
am 9f10e6a9
: am 70e0bd3a
: Merge "Rename the tzdata update tool, and add HTTP support."
...
* commit '9f10e6a96afbe85239d18c1cffb560c4f6ae9b4d':
Rename the tzdata update tool, and add HTTP support.
2013-04-22 11:36:51 -07:00
Elliott Hughes
9f10e6a96a
am 70e0bd3a
: Merge "Rename the tzdata update tool, and add HTTP support."
...
* commit '70e0bd3a448fc345d75d16caf40babf36463f0ec':
Rename the tzdata update tool, and add HTTP support.
2013-04-22 11:34:48 -07:00
Elliott Hughes
2379088a90
Upgrade to tzdata2013c.
...
From the release notes:
Changes affecting current and future time stamps:
Palestine observed DST starting March 29, 2013. (Thanks to
Steffen Thorsen.) From 2013 on, Gaza and Hebron both observe DST,
with the predicted rules being the last Thursday in March at 24:00
to the first Friday on or after September 21 at 01:00.
Assume that the recent change to Paraguay's DST rules is permanent,
by moving the end of DST to the 4th Sunday in March every year.
(Thanks to Carlos Raúl Perasso.)
Changes affecting past time stamps:
Fix some historical data for Palestine to agree with that of
timeanddate.com, as follows:
The spring 2008 change in Gaza and Hebron was on 00:00 Mar 28, not
00:00 Apr 1.
The fall 2009 change in Gaza and Hebron on Sep 4 was at 01:00, not
02:00.
The spring 2010 change in Hebron was 00:00 Mar 26, not 00:01 Mar 27.
The spring 2011 change in Gaza was 00:01 Apr 1, not 12:01 Apr 2.
The spring 2011 change in Hebron on Apr 1 was at 00:01, not 12:01.
The fall 2011 change in Hebron on Sep 30 was at 00:00, not 03:00.
Fix times of habitation for Macquarie to agree with the Tasmania
Parks & Wildlife Service history, which indicates that permanent
habitation was 1899-1919 and 1948 on.
Changing affecting metadata only:
Macquarie Island is politically part of Australia, not Antarctica.
(Thanks to Tobias Conradi.)
Sort Macquarie more-consistently with other parts of Australia.
(Thanks to Tim Parenti.)
Change-Id: I3df146d046eda26dbc6ce2a0a26ad9214ec4eaca
2013-04-22 11:33:14 -07:00
Elliott Hughes
f8dff7d449
Rename the tzdata update tool, and add HTTP support.
...
The FTP server is currently unavailable, but the HTTP server is working
fine.
Change-Id: If7f2f396e89aca022a60af531f3604523b7bf95c
2013-04-22 11:11:43 -07:00
Elliott Hughes
9a41d425ea
am d23a87d3
: am 8c181aa8
: Merge "Use hidden visibility for internal-use-only functions"
...
* commit 'd23a87d3b1c7269a4b55f082555790a3003ba228':
Use hidden visibility for internal-use-only functions
2013-04-15 11:26:47 -07:00
Elliott Hughes
d23a87d3b1
am 8c181aa8
: Merge "Use hidden visibility for internal-use-only functions"
...
* commit '8c181aa8fe421c62a8e30f4c10e322aca968c27c':
Use hidden visibility for internal-use-only functions
2013-04-15 11:24:14 -07:00
Elliott Hughes
8c181aa8fe
Merge "Use hidden visibility for internal-use-only functions"
2013-04-15 17:51:24 +00:00
Elliott Hughes
35a2a61d49
am cf4a5302
: am b3c8c4d8
: Merge "Switch to current FreeBSD qsort."
...
* commit 'cf4a53020d85b0017799c31dc41823f9e775a1c5':
Switch to current FreeBSD qsort.
2013-04-12 12:33:56 -07:00
Christopher Ferris
39e4ed9699
am 516a8970
: Merge "Rewrite memset for cortexa15 to use strd."
...
* commit '516a89705378f43646678e75924529404e52b613':
Rewrite memset for cortexa15 to use strd.
2013-04-12 12:30:22 -07:00