aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r30' into HEADHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0Jessica Wagantall2016-04-180-0/+0
|\ | | | | | | | | Ticket: RM-234 Android 6.0.1 release 30
| * Improve length checks in DHCP Options parsing of dhcpcd.Pierre Imai2016-02-261-8/+21
| | | | | | | | | | Bug: 26461634 Change-Id: I258b74c3f21bd312f0b7d2185b9cf419b3593637
* | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-8/+21
|\ \ | | | | | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 24
| * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-220-0/+0
| |\ \
| | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-170-0/+0
| | |\ \ | | |/ / | |/| / | | |/
| * / Improve length checks in DHCP Options parsing of dhcpcd.Pierre Imai2016-03-011-8/+21
| |/ | | | | | | | | Bug: 26461634 Change-Id: I258b74c3f21bd312f0b7d2185b9cf419b3593637
* | Don't fork and exec ls when the shell can stat files.Elliott Hughes2016-02-021-1/+1
| | | | | | | | | | | | I doubt this has any measurable impact, but there's no reason to be wasteful. Change-Id: I94a153df9073ac5eea4c310e03b2d5f360791276
* | Add change to also make .so for dhcpcdSkylar Chang2015-10-061-0/+10
|/ | | | | | This change is added to make libdhcpcd shared library. Change-Id: I27279e4ea6dda28969cb8bc306b2220c1d9ba736
* Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-151-1/+1
|\
| * Make dhcpcd retry DHCPv4 indefinitely.Erik Kline2015-03-021-1/+1
| | | | | | | | | | Bug: 19422416 Change-Id: I816fdadef31769241391ae1cb05a848d0647c107
* | am 9e145766: am a975f64d: am 5b66af54: Merge "Fix clang build."Dan Albert2015-03-110-0/+0
|\ \ | | | | | | | | | | | | * commit '9e1457661ad263e3d8cd38118f70d030b63aa070': Fix clang build.
| * \ am a975f64d: am 5b66af54: Merge "Fix clang build."Dan Albert2015-03-100-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit 'a975f64d97a5b41e0f4f9410d84d84eeb1aa6918': Fix clang build.
| | * \ am 5b66af54: Merge "Fix clang build."Dan Albert2015-03-100-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '5b66af5477511ee2f0d68f7267dd4b62c77ff5d9': Fix clang build.
| | | * \ Merge "Fix clang build."Dan Albert2015-03-091-0/+2
| | | |\ \
| | | | * | Fix clang build.Dan Albert2015-03-091-0/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | am 6285a598: am 7adb2828: am 45f6da64: (-s ours) Merge "Fun with buffer ↵Natalie Silvanovich2015-03-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overrruns." * commit '6285a598c2ce655ef7d93dfc616fde4ddc5c2f85': Fun with buffer overrruns.
| * | | | am 7adb2828: am 45f6da64: (-s ours) Merge "Fun with buffer overrruns."Natalie Silvanovich2015-03-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '7adb2828f48e57c620f232c64d7c012774fa80a3': Fun with buffer overrruns.
| | * | | am 45f6da64: (-s ours) Merge "Fun with buffer overrruns."Natalie Silvanovich2015-03-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '45f6da643b723e29aa94147adc2f143588e1d919': Fun with buffer overrruns.
| | | * | Merge "Fun with buffer overrruns."Natalie Silvanovich2015-03-093-2/+164
| | | |\ \
| | | | * | Fun with buffer overrruns.Erik Kline2015-03-063-2/+164
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 39d72dcd: am 22bd6386: Fix clang build.Dan Albert2015-02-201-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '39d72dcdd162af365717956acd4280ead441a70a': Fix clang build.
| * | | | am 22bd6386: Fix clang build.Dan Albert2015-02-201-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '22bd6386e28c9bd3fd15d896bc224cd989dd871b': Fix clang build.
| | * | | Fix clang build.Dan Albert2015-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 3f6d58e2: am 13f092c0: am b82be174: Merge "Fix implicit function ↵Elliott Hughes2015-02-202-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | declarations." * commit '3f6d58e270c01f53cd838ad9b79d99a0c6bdd258': Fix implicit function declarations.
| * | | | am 13f092c0: am b82be174: Merge "Fix implicit function declarations."Elliott Hughes2015-02-202-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '13f092c0d7341594c09983cb28586bab80b92121': Fix implicit function declarations.
| | * | | am b82be174: Merge "Fix implicit function declarations."Elliott Hughes2015-02-202-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit 'b82be17488382132602e33e1a64829e7e5358f0f': Fix implicit function declarations.
| | | * | Merge "Fix implicit function declarations."Elliott Hughes2015-02-202-0/+3
| | | |\ \
| | | | * | Fix implicit function declarations.Elliott Hughes2015-02-192-0/+3
| | | |/ / | | | | | | | | | | | | | | | Change-Id: Ie817cb4df05ae1edb9ec9149a5c15aac5c51dad4
* | | | | am 64836ad4: am c856def8: am 0b93c1c5: am 1990a910: am 23f28ff2: am ↵Erik Kline2015-02-182-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b32f45a: am df8360e1: am 8c596b79: am d8db5112: Remove set but not used variable * commit '64836ad4736f0f4eb2cac44ad640b2e12053567f': Remove set but not used variable
| * | | | am c856def8: am 0b93c1c5: am 1990a910: am 23f28ff2: am 3b32f45a: am ↵Erik Kline2015-02-182-5/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | df8360e1: am 8c596b79: am d8db5112: Remove set but not used variable * commit 'c856def80a1f47d42d173bd31f5d454344c2f024': Remove set but not used variable
| | * | am 0b93c1c5: am 1990a910: am 23f28ff2: am 3b32f45a: am df8360e1: am ↵Erik Kline2015-02-182-5/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c596b79: am d8db5112: Remove set but not used variable * commit '0b93c1c5312c8907e0bfc022845886d9fe81387e': Remove set but not used variable
| | | * \ am 1990a910: am 23f28ff2: am 3b32f45a: am df8360e1: am 8c596b79: am ↵Erik Kline2015-02-172-5/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8db5112: Remove set but not used variable * commit '1990a91003f9a9e549bc7fd6834a2e96b33c74f8': Remove set but not used variable
| | | | * \ am 23f28ff2: am 3b32f45a: am df8360e1: am 8c596b79: am d8db5112: Remove set ↵Erik Kline2015-02-132-5/+3
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but not used variable * commit '23f28ff22eba9684bc468c92ec5b0ff0282c10a1': Remove set but not used variable
| | | | | * \ am 3b32f45a: am df8360e1: am 8c596b79: am d8db5112: Remove set but not used ↵Erik Kline2015-02-132-5/+3
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variable * commit '3b32f45ad5d885a85b9a7e9f38cddd05e40287ad': Remove set but not used variable
| | | | | | * \ am df8360e1: am 8c596b79: am d8db5112: Remove set but not used variableErik Kline2015-02-132-5/+3
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df8360e1f5c2a240fb0279479e224685b728db14': Remove set but not used variable
| | | | | | | * \ am 8c596b79: am d8db5112: Remove set but not used variableErik Kline2015-02-132-5/+3
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c596b7916e9db949e56e9c544fb41c59380d1c3': Remove set but not used variable
| | | | | | | | * \ am d8db5112: Remove set but not used variableErik Kline2015-02-132-5/+3
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8db511257003e107528ff9c12ac2df5af13361b': Remove set but not used variable
| | | | | | | | | * | Remove set but not used variableErik Kline2015-02-112-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19245503 Change-Id: I57002952eadf4d5b7636e78fc0846c915cceb5dd
* | | | | | | | | | | am 688bf622: am 57cf78d0: am 3ef3c85a: am e0988b4b: am 8ee8b362: am ↵Erik Kline2015-01-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8cd001c: am 18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns. * commit '688bf62225e5a639d17bf7421fa865714aa3a92c': Fun with buffer overrruns.
| * | | | | | | | | | am 57cf78d0: am 3ef3c85a: am e0988b4b: am 8ee8b362: am c8cd001c: am ↵Erik Kline2015-01-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns. * commit '57cf78d09a98b4a2952d7542528570bd40f31347': Fun with buffer overrruns.
| | * | | | | | | | | am 3ef3c85a: am e0988b4b: am 8ee8b362: am c8cd001c: am 18ccfeaf: am ↵Erik Kline2015-01-290-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ddde5cb3: am ab760879: Fun with buffer overrruns. * commit '3ef3c85abec64ea7d7a357f1a06c2d89d83ccace': Fun with buffer overrruns.
| | | * | | | | | | | am e0988b4b: am 8ee8b362: am c8cd001c: am 18ccfeaf: am ddde5cb3: am ↵Erik Kline2015-01-293-2/+164
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab760879: Fun with buffer overrruns. * commit 'e0988b4b7e6de2444482714041497c66ac459efc': Fun with buffer overrruns.
| | | | * | | | | | | am 8ee8b362: am c8cd001c: am 18ccfeaf: am ddde5cb3: am ab760879: Fun with ↵Erik Kline2015-01-293-2/+164
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer overrruns. * commit '8ee8b3621988dfbb4d170a5a2d55da3d311dfd65': Fun with buffer overrruns.
| | | | | * | | | | | am c8cd001c: am 18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns.Erik Kline2015-01-293-2/+164
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8cd001cdaf31a5ff90b2d39c290716e501e01a4': Fun with buffer overrruns.
| | | | | | * | | | | am 18ccfeaf: am ddde5cb3: am ab760879: Fun with buffer overrruns.Erik Kline2015-01-293-2/+164
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '18ccfeaf48996bc825b4a1b500aa64db7cee3177': Fun with buffer overrruns.
| | | | | | | * | | | am ddde5cb3: am ab760879: Fun with buffer overrruns.Erik Kline2015-01-293-2/+164
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddde5cb3e23313753cc1559944b85259e7d4971b': Fun with buffer overrruns.
| | | | | | | | * | | am ab760879: Fun with buffer overrruns.Erik Kline2015-01-293-2/+164
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab76087921df3dde0c28776d31d7e6873aec9609': Fun with buffer overrruns.
| | | | | | | | | * | Fun with buffer overrruns.Erik Kline2014-12-123-2/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Bug: 18356137 Bug: 18356135 Change-Id: I0f907b8a952208749226ba034a416d773e068f8a (cherry picked from commit c1c270dba20afa63a5b7769646cf721d0fa7c431)
* | | | | | | | | | | Merge "Removed stray tabs."Greg Hartman2014-12-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed stray tabs.Greg Hartman2014-12-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3479b6a836f0dd271b1a33734a75857751af46d6
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 01:20:34 +0000