aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-13Merge "Make dhcpd admit to using BSD extensions."HEADandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2mastermainElliott Hughes
2016-05-13Make dhcpd admit to using BSD extensions.Elliott Hughes
Change-Id: I7f1cda4d2574468e550e797ebfbb6885b7f8db33
2015-09-01am e407eedc: Merge "Don\'t fork and exec ls when the shell can stat files."android-n-preview-2android-n-preview-1brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m7-releasebrillo-m7-mr-devbrillo-m7-devbrillo-m10-releasebrillo-m10-devElliott Hughes
* commit 'e407eedc064aba5ce4e2580d39a7b5926f5e9a7e': Don't fork and exec ls when the shell can stat files.
2015-08-31Merge "Don't fork and exec ls when the shell can stat files."Elliott Hughes
2015-08-28Don't fork and exec ls when the shell can stat files.Elliott Hughes
I doubt this has any measurable impact, but there's no reason to be wasteful. Change-Id: I94a153df9073ac5eea4c310e03b2d5f360791276
2015-03-15Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r5android-6.0.1_r4android-6.0.1_r3android-6.0.1_r22android-6.0.1_r21android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr1-devmarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseVinit Deshpande
2015-03-11am 9e145766: am a975f64d: am 5b66af54: Merge "Fix clang build."Dan Albert
* commit '9e1457661ad263e3d8cd38118f70d030b63aa070': Fix clang build.
2015-03-10am 6285a598: am 7adb2828: am 45f6da64: (-s ours) Merge "Fun with buffer ↵Natalie Silvanovich
overrruns." * commit '6285a598c2ce655ef7d93dfc616fde4ddc5c2f85': Fun with buffer overrruns.
2015-03-10am a975f64d: am 5b66af54: Merge "Fix clang build."Dan Albert
* commit 'a975f64d97a5b41e0f4f9410d84d84eeb1aa6918': Fix clang build.
2015-03-10am 5b66af54: Merge "Fix clang build."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soongDan Albert
* commit '5b66af5477511ee2f0d68f7267dd4b62c77ff5d9': Fix clang build.
2015-03-09Merge "Fix clang build."Dan Albert
2015-03-09Fix clang build.Dan Albert
Since this is an upstream project, just disable the warning for now. It doesn't cause any harm, it's just useless code. Change-Id: Icaec05aa4b87fa742405710058e1abf9c1e7ee50 (cherry picked from commit 22bd6386e28c9bd3fd15d896bc224cd989dd871b)
2015-03-09am 7adb2828: am 45f6da64: (-s ours) Merge "Fun with buffer overrruns."Natalie Silvanovich
* commit '7adb2828f48e57c620f232c64d7c012774fa80a3': Fun with buffer overrruns.
2015-03-09am 45f6da64: (-s ours) Merge "Fun with buffer overrruns."Natalie Silvanovich
* commit '45f6da643b723e29aa94147adc2f143588e1d919': Fun with buffer overrruns.
2015-03-09Merge "Fun with buffer overrruns."Natalie Silvanovich
2015-03-06Fun with buffer overrruns.Erik Kline
In get_option(): don't read past the end of the option buffer. Also add a small unittest to verify sane behaviour for the above. The dhcpcd code is not easily refactored into a library, nor is it entirely possible to include some header files directly since some structures use C++ reserved keywords ("new") for variable names. In print_option(): use of snprintf() returns the length that /would/ have been written. Add checks that the output buffer is not overrun when printing. This fixes CVE-2014-7912 and CVE-2014-7913 Bug: 18356137 Bug: 18356135 Change-Id: I0f907b8a952208749226ba034a416d773e068f8a
2015-03-02Make dhcpcd retry DHCPv4 indefinitely.Erik Kline
Bug: 19422416 Change-Id: I816fdadef31769241391ae1cb05a848d0647c107
2015-02-20am 39d72dcd: am 22bd6386: Fix clang build.Dan Albert
* commit '39d72dcdd162af365717956acd4280ead441a70a': Fix clang build.
2015-02-20am 22bd6386: Fix clang build.Dan Albert
* commit '22bd6386e28c9bd3fd15d896bc224cd989dd871b': Fix clang build.
2015-02-20Fix clang build.Dan Albert
Since this is an upstream project, just disable the warning for now. It doesn't cause any harm, it's just useless code. Change-Id: Icaec05aa4b87fa742405710058e1abf9c1e7ee50
2015-02-20am 3f6d58e2: am 13f092c0: am b82be174: Merge "Fix implicit function ↵Elliott Hughes
declarations." * commit '3f6d58e270c01f53cd838ad9b79d99a0c6bdd258': Fix implicit function declarations.
2015-02-20am 13f092c0: am b82be174: Merge "Fix implicit function declarations."Elliott Hughes
* commit '13f092c0d7341594c09983cb28586bab80b92121': Fix implicit function declarations.
2015-02-20am b82be174: Merge "Fix implicit function declarations."Elliott Hughes
* commit 'b82be17488382132602e33e1a64829e7e5358f0f': Fix implicit function declarations.
2015-02-20Merge "Fix implicit function declarations."Elliott Hughes
2015-02-19Fix implicit function declarations.Elliott Hughes
Change-Id: Ie817cb4df05ae1edb9ec9149a5c15aac5c51dad4
2015-02-18am 64836ad4: am c856def8: am 0b93c1c5: am 1990a910: am 23f28ff2: am ↵Erik Kline
3b32f45a: am df8360e1: am 8c596b79: am d8db5112: Remove set but not used variable * commit '64836ad4736f0f4eb2cac44ad640b2e12053567f': Remove set but not used variable
2015-02-18am c856def8: am 0b93c1c5: am 1990a910: am 23f28ff2: am 3b32f45a: am ↵Erik Kline
df8360e1: am 8c596b79: am d8db5112: Remove set but not used variable * commit 'c856def80a1f47d42d173bd31f5d454344c2f024': Remove set but not used variable
2015-02-18am 0b93c1c5: am 1990a910: am 23f28ff2: am 3b32f45a: am df8360e1: am ↵android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaseErik Kline
8c596b79: am d8db5112: Remove set but not used variable * commit '0b93c1c5312c8907e0bfc022845886d9fe81387e': Remove set but not used variable
2015-02-17am 1990a910: am 23f28ff2: am 3b32f45a: am df8360e1: am 8c596b79: am ↵Erik Kline
d8db5112: Remove set but not used variable * commit '1990a91003f9a9e549bc7fd6834a2e96b33c74f8': Remove set but not used variable
2015-02-13am 23f28ff2: am 3b32f45a: am df8360e1: am 8c596b79: am d8db5112: Remove set ↵Erik Kline
but not used variable * commit '23f28ff22eba9684bc468c92ec5b0ff0282c10a1': Remove set but not used variable
2015-02-13am 3b32f45a: am df8360e1: am 8c596b79: am d8db5112: Remove set but not used ↵Erik Kline
variable * commit '3b32f45ad5d885a85b9a7e9f38cddd05e40287ad': Remove set but not used variable
2015-02-13am df8360e1: am 8c596b79: am d8db5112: Remove set but not used variableErik Kline
* commit 'df8360e1f5c2a240fb0279479e224685b728db14': Remove set but not used variable
2015-02-13am 8c596b79: am d8db5112: Remove set but not used variableErik Kline
* commit '8c596b7916e9db949e56e9c544fb41c59380d1c3': Remove set but not used variable
2015-02-13am d8db5112: Remove set but not used variableErik Kline
* commit 'd8db511257003e107528ff9c12ac2df5af13361b': Remove set but not used variable
2015-02-11Remove set but not used variableErik Kline
Bug: 19245503 Change-Id: I57002952eadf4d5b7636e78fc0846c915cceb5dd
2015-01-29am 688bf622: am 57cf78d0: am 3ef3c85a: am e0988b4b: am 8ee8b362: am ↵Erik Kline
c8cd001c: am 18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns. * commit '688bf62225e5a639d17bf7421fa865714aa3a92c': Fun with buffer overrruns.
2015-01-29am 57cf78d0: am 3ef3c85a: am e0988b4b: am 8ee8b362: am c8cd001c: am ↵Erik Kline
18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns. * commit '57cf78d09a98b4a2952d7542528570bd40f31347': Fun with buffer overrruns.
2015-01-29am 3ef3c85a: am e0988b4b: am 8ee8b362: am c8cd001c: am 18ccfeaf: am ↵lollipop-mr1-devErik Kline
ddde5cb3: am ab760879: Fun with buffer overrruns. * commit '3ef3c85abec64ea7d7a357f1a06c2d89d83ccace': Fun with buffer overrruns.
2015-01-29am e0988b4b: am 8ee8b362: am c8cd001c: am 18ccfeaf: am ddde5cb3: am ↵Erik Kline
ab760879: Fun with buffer overrruns. * commit 'e0988b4b7e6de2444482714041497c66ac459efc': Fun with buffer overrruns.
2015-01-29am 8ee8b362: am c8cd001c: am 18ccfeaf: am ddde5cb3: am ab760879: Fun with ↵Erik Kline
buffer overrruns. * commit '8ee8b3621988dfbb4d170a5a2d55da3d311dfd65': Fun with buffer overrruns.
2015-01-29am c8cd001c: am 18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns.Erik Kline
* commit 'c8cd001cdaf31a5ff90b2d39c290716e501e01a4': Fun with buffer overrruns.
2015-01-29am 18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns.Erik Kline
* commit '18ccfeaf48996bc825b4a1b500aa64db7cee3177': Fun with buffer overrruns.
2015-01-29am ddde5cb3: am ab760879: Fun with buffer overrruns.Erik Kline
* commit 'ddde5cb3e23313753cc1559944b85259e7d4971b': Fun with buffer overrruns.
2015-01-29am ab760879: Fun with buffer overrruns.Erik Kline
* commit 'ab76087921df3dde0c28776d31d7e6873aec9609': Fun with buffer overrruns.
2014-12-19Merge "Removed stray tabs."Greg Hartman
2014-12-19am 816eb12b: am 4ccc2546: Merge "Manually update the dhcpcd NOTICE file."Elliott Hughes
* commit '816eb12bc8853d753320d582cc7d2839f96c12a3': Manually update the dhcpcd NOTICE file.
2014-12-19am 4ccc2546: Merge "Manually update the dhcpcd NOTICE file."Elliott Hughes
* commit '4ccc2546dc556c063c697ba7a27aee87bec7e775': Manually update the dhcpcd NOTICE file.
2014-12-19Merge "Manually update the dhcpcd NOTICE file."Elliott Hughes
2014-12-18Manually update the dhcpcd NOTICE file.Elliott Hughes
Bug: https://code.google.com/p/android/issues/detail?id=82938 Change-Id: I4bc628919aec61645d39dbe05b8df7dc655de981
2014-12-18Removed stray tabs.Greg Hartman
Change-Id: I3479b6a836f0dd271b1a33734a75857751af46d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 21:06:42 +0000