summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-04[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours ↵android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-qpr3-beta-1Xin Li
am: 8028e19c81 -s ours am: 3d5c1fdbb8 -s ours am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1611851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a2bb032939b78528c5e8d50fbb9b0296cc3e800
2021-03-03[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours ↵temp_ab_7272582Xin Li
am: 8028e19c81 -s ours am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1611851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id8f9c30eea81d70ff74c0b8feff6d5dd139a915f
2021-03-03[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s oursXin Li
am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1611851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibfd62b21ce90e709268d2a229ac64c0370d1d9d5
2021-03-03Merge "Merge RQ2A.210305.007"android-s-beta-2android-s-beta-1Xin Li
2021-03-03Merge RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 Change-Id: Ic3a22cca1598fcca0aec10bb02e1d818275968a0
2021-03-02[automerger skipped] Merge RQ2A.210305.007 into stage. am: e47d310450 -s ↵Xin Li
ours am: 2f1c53f4ec -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13719284 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c817e69650e2ac394e0a7245bdde0b682d02c79
2021-03-02[automerger skipped] Merge RQ2A.210305.007 into stage. am: e47d310450 -s oursXin Li
am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13719284 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idaecaf8753696868c66ab9a2008f09858c4dd3b6
2021-03-01Merge RQ2A.210305.007 into stage.temp_RQ2A.210305.007Xin Li
Bug: 180401296 Merged-In: I90390535198fe0a7b8084879d39f813d8de51ab3 Change-Id: I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d981f96871 -s ↵Xin Li
ours am: ed37bde80f -s ours am skip reason: Change-Id I25dc1ffe44d6fb85da74e4a6f868170627055133 with SHA-1 e9bfc647fd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6939c1aef302874af9b1fed0fdbff7d371dcdb11
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d981f96871 -s oursXin Li
am skip reason: Change-Id I25dc1ffe44d6fb85da74e4a6f868170627055133 with SHA-1 e9bfc647fd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idec4fde6a52ef977a70a91c8fad8f05c13ed370e
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I25dc1ffe44d6fb85da74e4a6f868170627055133 Change-Id: Ida37dc495d91a07999080efc0989e3c6d981498b
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasq" am: dcfaf020a4 am: ↵Treehugger Robot
d3fb929316 am: 2fec6b944b Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1588703 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I216e9f9209526fa0e80b0a8236c631265cca13ef
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasq" am: dcfaf020a4 am: ↵Treehugger Robot
d3fb929316 Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1588703 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7caafd924300555b6273f47a51a3280e5546c9db
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasq" am: dcfaf020a4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1588703 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia7e81c2dd47ac65e949e7dcb23c55af15ebfee5b
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasq"Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/dnsmasqBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT legacy_unencumbered to: src/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I910cb218b69e54a56cd9d51b655021fc7115e583
2021-01-12Merge cherrypicks of [13320072, 13319971, 13320351, 13320073, 13320352, ↵android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android11-qpr2-releaseandroid-build-team Robot
13320131, 13320074, 13320075, 13321410, 13320132, 13319972, 13320076, 13320077, 13320353, 13320354] into rvc-qpr2-release Change-Id: Ib04297d1a702d91fed0dca027ea70104a24d8318
2021-01-12dnsmasq: fix heap overflowLuke Huang
Backport CVE-2017-14491. (http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=0549c73b7ea6b22a3c49beb4d432f185a81efcbc) Bug: 158221622 Test: 1. Manual testing - build dnsmasq with asan enabled and test the corresponding functionalities. 2. Test tethering still worked fine Change-Id: I90390535198fe0a7b8084879d39f813d8de51ab3 (cherry picked from commit b7ae3453bfcc139be75c8dec5cdb8a1453eb6e16) (cherry picked from commit 2c415e570aed0b955698238a274a50f3ffa4892e)
2021-01-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ↵Luke Huang
ca9cb3b4da -s ours am: 372d63f821 -s ours am: c2bcdbe462 -s ours am: 98c5119851 -s ours am: eb35423b6a -s ours am: 6ac5fd1a56 -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I40aecb6d4c427699fe784d727c569b0a7050bf34
2021-01-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ↵Luke Huang
ca9cb3b4da -s ours am: 372d63f821 -s ours am: c2bcdbe462 -s ours am: 98c5119851 -s ours am: eb35423b6a -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1bd92f35564bca1dec61bb1eba60cf7f2a451cb1
2021-01-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ↵Luke Huang
ca9cb3b4da -s ours am: 372d63f821 -s ours am: c2bcdbe462 -s ours am: 98c5119851 -s ours am: 6e5dfb83fd -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I299871598386d80e8a911cca44ccb090ee9e5d62
2021-01-08[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ↵Luke Huang
ca9cb3b4da -s ours am: 372d63f821 -s ours am: c2bcdbe462 -s ours am: 98c5119851 -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5587331363e9f3d8a7c3fbeabfa91d6b9f769cf8
2021-01-07[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ↵Luke Huang
ca9cb3b4da -s ours am: 372d63f821 -s ours am: c2bcdbe462 -s ours am: 98c5119851 -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2819ca271f48440b602d3d6dfd486f4f07114db6
2021-01-07[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ↵Luke Huang
ca9cb3b4da -s ours am: 372d63f821 -s ours am: c2bcdbe462 -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I46e62f756d3dbc6008d1beb0339c388272b2ad84
2021-01-07[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ↵Luke Huang
ca9cb3b4da -s ours am: 372d63f821 -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ea2821f14387a943057e1aa0a53bb5bf8865954
2021-01-07[automerger skipped] backport: dnsmasq: fix heap overflow am: 303ca2733a am: ↵Luke Huang
ca9cb3b4da -s ours am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia002c6d9627bd558f3b630cf46200b6ba1d01691
2021-01-07backport: dnsmasq: fix heap overflow am: 303ca2733aLuke Huang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13183671 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie18e0976766e067fd9aff6e6a103feec16aa859b
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35 am: ↵Luke Huang
5bfc7bb2fb am: ef42febf89 am: b93b1a2dc0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13032295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f24af0cf6a53681c3b02c686b3603b19fa0be69
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35 am: ↵Luke Huang
5bfc7bb2fb am: ef42febf89 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13032295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia3397890fbacfaa20af881b15f724e6d3f106be4
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35 am: ↵Luke Huang
5bfc7bb2fb Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13032295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If6d2cd65b9fb98660494b6a8b7a058666cae2ff8
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35 am: ↵Luke Huang
965761ea62 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13032295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1650efb1ed78585776b2c3c8c978e6e6e26ac44d
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35Luke Huang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13032295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e0c9f7532ab21784e8317a36460c483ba12d889
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509f am: 35a6d0cb35Luke Huang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13032295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id9816b16aa91c463cac086df03f66f4297a6f95b
2021-01-07dnsmasq: fix heap overflow am: 2c415e570a am: d9b4de509fLuke Huang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13032295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia9954467d02d04c459c1365c7ab21191cb892e51
2021-01-07dnsmasq: fix heap overflow am: 2c415e570aLuke Huang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13032295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6801014271f409666bb4781121842880d0240b62
2021-01-05Merge "dnsmasq: Remove DAD Retry" am: 5cd56ee08c am: 9714eb8446 am: d1a1b7cf29Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1496463 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8275300c0ce6afc1d3ad99e1fa9201b5dc731c12
2021-01-05Merge "dnsmasq: Remove DAD Retry" am: 5cd56ee08c am: 9714eb8446Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1496463 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7c4a39e7e86127a85fba580be30620897372f60d
2021-01-05Merge "dnsmasq: Remove DAD Retry" am: 5cd56ee08cMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1496463 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c7878d66b8bc5d931ddea7f4d761d2a42294090
2021-01-05Merge "dnsmasq: Remove DAD Retry"Maciej Żenczykowski
2021-01-05dnsmasq: Remove DAD RetryTyler Wear
DAD is disabled in TetherController, which sets accept_dad and dad_transmits to zero, so the the retry here doesn't help wrt DAD. The loop will lock dnsmasq for up to 20 seconds in error scenario's though, which is undesirable. Since IFA_F_NODAD is not set on address loop will be reduced to 1 second for now. When bind fails die() should not be called since dnsmasq is never restarted as long as tethering is enabled. Cleaning up and returning should suffice while not impacting on going tethering. Bug: 171409363 Change-Id: Id0c065c75c869d7bd241390682b7e5d932a74a22
2020-12-08backport: dnsmasq: fix heap overflowLuke Huang
Backport CVE-2017-14491. (http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=0549c73b7ea6b22a3c49beb4d432f185a81efcbc) Bug: 158221622 Test: 1. Manual testing - build dnsmasq with asan enabled and test the corresponding functionalities. 2. Test tethering still worked fine Change-Id: I05f33d872f44b015706139f0a438171c42b0b27e Merged-In: I90390535198fe0a7b8084879d39f813d8de51ab3
2020-11-24Mark ab/6881855 as merged am: 9a192e894b am: e9bfc647fdXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13112740 Change-Id: I7ff40c07772658ab2297afb92f9dc3f6b4a9453b
2020-11-24Mark ab/6881855 as merged am: 9a192e894bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/13112740 Change-Id: I25dc1ffe44d6fb85da74e4a6f868170627055133
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: If6ba20a21c6f5cfa0473967971ee299e9b30fb40
2020-11-11dnsmasq: fix heap overflowLuke Huang
Backport CVE-2017-14491. (http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=0549c73b7ea6b22a3c49beb4d432f185a81efcbc) Bug: 158221622 Test: 1. Manual testing - build dnsmasq with asan enabled and test the corresponding functionalities. 2. Test tethering still worked fine Change-Id: I90390535198fe0a7b8084879d39f813d8de51ab3 (cherry picked from commit b7ae3453bfcc139be75c8dec5cdb8a1453eb6e16)
2020-11-10Merge "dnsmasq: fix heap overflow"Luke Huang
2020-11-10dnsmasq: fix heap overflowLuke Huang
Backport CVE-2017-14491. (http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=0549c73b7ea6b22a3c49beb4d432f185a81efcbc) Bug: 158221622 Test: 1. Manual testing - build dnsmasq with asan enabled and test the corresponding functionalities. 2. Test tethering still worked fine Change-Id: I90390535198fe0a7b8084879d39f813d8de51ab3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 55ac24fafc -s ours am: ↵Xin Li
bb5d04f4f1 -s ours am: f28399870e -s ours am skip reason: Change-Id I85603beec48195eb83f84f411fbab03c8fb604b1 with SHA-1 b88cf99c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/12796964 Change-Id: I7df6c3800942dc0acce412cc758ae9df51c15bc2
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 55ac24fafc -s ours am: ↵Xin Li
bb5d04f4f1 -s ours am skip reason: Change-Id I85603beec48195eb83f84f411fbab03c8fb604b1 with SHA-1 b88cf99c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/12796964 Change-Id: I87f4321bcee237a1ff870135e8ff9d8480001a3d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 55ac24fafc -s oursXin Li
am skip reason: Change-Id I85603beec48195eb83f84f411fbab03c8fb604b1 with SHA-1 b88cf99c05 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dnsmasq/+/12796964 Change-Id: I53e9ed28251b494c45f3ddf033db73b36a791859
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 02:04:34 +0000