aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-03Snap for 7419753 from bf1fd31ee7c7c31f8e3de4ad1483bf4153bbbcd6 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-s-beta-4android-s-beta-3android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-releaseandroid12-beta3-releaseandroid-s-beta-4android-build-team Robot
Change-Id: Ifacb42f560a261a7178f0e4c1519a08d0793efb0
2021-06-01Enable Async MTE in iptables.android-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devEvgenii Stepanov
This change enables Async mode ARM MTE in iptables on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I6916462c36f34332fc14c140be619d946c22d1f5 Merged-In: I6916462c36f34332fc14c140be619d946c22d1f5 (cherry picked from commit bfcaf7b8d786e69539b51156782ffa42379f1e68)
2021-04-03Snap for 7256110 from 89a5ed820ab0ba2a68bc00088fd3cd91c295b89d to sc-releaseandroid-s-beta-2android-build-team Robot
Change-Id: Icceb991e47a7bbb7645bd53e88645649992fd9f8
2021-04-02Merge changes from topic "b183485987" am: 90c8570e0b am: 74515b357f am: ↵Maciej Żenczykowski
7b1df5255c Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650938 Change-Id: I05d9c24ef351a2f9b1661ebab619a61db6c16a3b
2021-04-02ANDROID: fix build for missing ETH_ALEN definition am: 7608e136bd am: ↵Maciej Żenczykowski
3799b1e13f am: f751c1415e Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650937 Change-Id: I2d1d6c9df66bb0908ecd75f3ddba7712819ff6a8
2021-04-02ANDROID: update to 1.8.7 version am: 234472c9f2 am: d5b45ca17d am: 505f376396Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650936 Change-Id: I0e3207c45956c509447a3381991fe2f19d574d6b
2021-04-02Merge tag 'v1.8.7' of git://git.netfilter.org/iptables am: 28a74be8ec am: ↵Maciej Żenczykowski
e3fbb32008 am: 51119072b7 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650935 Change-Id: Ic76a7e8ca9e382dff33157f3868178bece99116d
2021-04-02Merge tag 'v1.8.6' of git://git.netfilter.org/iptables am: de7a62aa82 am: ↵Maciej Żenczykowski
72f23c9bf9 am: af645f03f7 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650934 Change-Id: I78d13cf391bf31162e583ff5536bc8713de407e8
2021-04-02Merge tag 'v1.8.5' of git://git.netfilter.org/iptables am: 903e1da7b1 am: ↵Maciej Żenczykowski
40cceefbdd am: 9f34af727c Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650933 Change-Id: Ib0bb53693d4e1bf4a3e7f42e57054a4105f29e14
2021-04-02ANDROID: revert to upstream xt_IDLETIMER am: 3d6ee083d6 am: 218fa32d9f am: ↵Maciej Żenczykowski
d10bb0c810 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650932 Change-Id: I7c4d2b39f1f0331c53def6a761ae6bbf7c6da6c0
2021-04-02Merge changes from topic "b183485987" am: 90c8570e0b am: 74515b357fMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650938 Change-Id: Ib1ab493361b810c33224ab364a9756397f1210bf
2021-04-02ANDROID: fix build for missing ETH_ALEN definition am: 7608e136bd am: 3799b1e13fMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650937 Change-Id: I5d9d860bd592e5005bb0b0b97caa21ad9f99abe0
2021-04-02ANDROID: update to 1.8.7 version am: 234472c9f2 am: d5b45ca17dMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650936 Change-Id: I13cad964647230026946d0d113dc12800a4855c4
2021-04-02Merge tag 'v1.8.7' of git://git.netfilter.org/iptables am: 28a74be8ec am: ↵Maciej Żenczykowski
e3fbb32008 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650935 Change-Id: Icaa33bafafc838fe87d2aa595f4171a977c89ffe
2021-04-02Merge tag 'v1.8.6' of git://git.netfilter.org/iptables am: de7a62aa82 am: ↵Maciej Żenczykowski
72f23c9bf9 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650934 Change-Id: If07d29396cc2c2bd2d5676e91066c1d0bdb37547
2021-04-02Merge tag 'v1.8.5' of git://git.netfilter.org/iptables am: 903e1da7b1 am: ↵Maciej Żenczykowski
40cceefbdd Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650933 Change-Id: I6af5c6850707853ed4dddb9103e46ab651fefe6d
2021-04-02ANDROID: revert to upstream xt_IDLETIMER am: 3d6ee083d6 am: 218fa32d9fMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650932 Change-Id: Id9673e38926613f5391e41458af977807af782b2
2021-04-02Merge changes from topic "b183485987" am: 90c8570e0bMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650938 Change-Id: Ife58046dcaa87539fd0e6cf9d8e04c459d54565a
2021-04-02ANDROID: fix build for missing ETH_ALEN definition am: 7608e136bdMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650937 Change-Id: I161493ffedc6c18aba3c0cb8421913db689321cf
2021-04-02ANDROID: update to 1.8.7 version am: 234472c9f2Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650936 Change-Id: Ibfb1e11ad304c7658aff15e273a812071408ad61
2021-04-02Merge tag 'v1.8.7' of git://git.netfilter.org/iptables am: 28a74be8ecMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650935 Change-Id: Iea483b0900bce0423d74100b6c65a6ffdf62b1cb
2021-04-02Merge tag 'v1.8.6' of git://git.netfilter.org/iptables am: de7a62aa82Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650934 Change-Id: I0aee86624daabc571585b7bfee66accdba32bf45
2021-04-02Merge tag 'v1.8.5' of git://git.netfilter.org/iptables am: 903e1da7b1Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650933 Change-Id: Id81a6b748ff68fc5c0a93ad9ba4154fb17034317
2021-04-02ANDROID: revert to upstream xt_IDLETIMER am: 3d6ee083d6Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1650932 Change-Id: If5c8371f7850d45575ce832d439abe14736325a1
2021-04-02Merge changes from topic "b183485987"android-s-beta-1Maciej Żenczykowski
* changes: ANDROID: re-add xt_IDLETIMER changes ANDROID: fix build for missing ETH_ALEN definition ANDROID: update to 1.8.7 version Merge tag 'v1.8.7' of git://git.netfilter.org/iptables Merge tag 'v1.8.6' of git://git.netfilter.org/iptables Merge tag 'v1.8.5' of git://git.netfilter.org/iptables ANDROID: revert to upstream xt_IDLETIMER
2021-04-02ANDROID: re-add xt_IDLETIMER changesMaciej Żenczykowski
(but this time in a more upstream compatible fashion) Test: atest, TreeHugger Bug: 183485987 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Iba7aefffcd19910466bbbfeafef1d5c964e59a95
2021-03-23ANDROID: fix build for missing ETH_ALEN definitionMaciej Żenczykowski
Test: see followup commits Bug: 183485987 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I2322f6e9a1f7a54adceeaf9cb3fe9b4cf78b1885
2021-03-23ANDROID: update to 1.8.7 versionMaciej Żenczykowski
Test: see followup commits Bug: 183485987 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I64b3c82de12802442e47151ee839edec5ecd10a4
2021-03-23Merge tag 'v1.8.7' of git://git.netfilter.org/iptablesMaciej Żenczykowski
iptables 1.8.7 release Test: part of series, see followup commits Bug: 183485987 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I9aa1d4d5603ba94b79198bc1594fc237222f933a
2021-03-23Merge tag 'v1.8.6' of git://git.netfilter.org/iptablesMaciej Żenczykowski
iptables 1.8.6 release Test: part of series, see followup commits Bug: 183485987 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Iec08e6fc411268f5f1caaed1352b0b1649a70a6c
2021-03-23Merge tag 'v1.8.5' of git://git.netfilter.org/iptablesMaciej Żenczykowski
iptables 1.8.5 release Test: part of series, see followup commits Bug: 183485987 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I6083f7138ed0bd9e2685c9e7aaa0483377288dd9
2021-03-23ANDROID: revert to upstream xt_IDLETIMERMaciej Żenczykowski
Generated via: git fetch git://git.netfilter.org/iptables refs/tags/v1.8.4 for i in extensions/libxt_IDLETIMER.c extensions/libxt_IDLETIMER.man include/linux/netfilter/xt_IDLETIMER.h; do git cat-file -p FETCH_HEAD:$i > $i done Test: part of series - see followup commits Bug: 183485987 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I3d943d0205625e3234cf13082504164a5dc713b3
2021-02-21Snap for 7160059 from 188d85704abd077bed9a2e1388bbb990b04c9daa to sc-releaseandroid-build-team Robot
Change-Id: I4ddc9137fa9bfe692f1288d7ec7c833d87fd48ff
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6f2d99bcd4 -s ↵Xin Li
ours am: bb04fbe2a6 -s ours am skip reason: Change-Id I531dd401b93a779a09c02a954f0228c97921ed03 with SHA-1 5ed935fb1a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I23dc6f461294494808b14f53b68fcb27a7f22546
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6f2d99bcd4 -s oursXin Li
am skip reason: Change-Id I531dd401b93a779a09c02a954f0228c97921ed03 with SHA-1 5ed935fb1a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d3ed6f7a85c574b4aa351b7670918fca7fe4934
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I531dd401b93a779a09c02a954f0228c97921ed03 Change-Id: I06532152bdf82ef74b10a498326ccf8b43427ca5
2021-02-18Snap for 7152399 from 073dd6c2a15af6d35d10686f0a34d8aabf723f5c to sc-releaseandroid-build-team Robot
Change-Id: I81a9356bf98a5481b30a1ec7ecb2a5270b321bdb
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iptables" am: e09abae5c5 ↵Bob Badour
am: ad91f45aaf am: 6af95f3631 Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1588826 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae669da6b0ff6d202e93bd26320dc4060a638681
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iptables" am: e09abae5c5 ↵Bob Badour
am: ad91f45aaf Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1588826 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52ca0d0d1026ebcfc9938e88ae21e266e8e66ea9
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iptables" am: e09abae5c5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/1588826 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66d1daa0e0f92d00d89554cc0601a07a70c0d37e
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iptables"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/iptablesBob Badour
Added SPDX-license-identifier-Artistic SPDX-license-identifier-Artistic-2.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: iptables/Android.bp Added SPDX-license-identifier-Artistic SPDX-license-identifier-Artistic-2.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT to: Android.bp Added SPDX-license-identifier-GPL to: libiptc/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 to: extensions/Android.bp Added SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: libxtables/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I457d29f9cf99f841712fa9d015859fbd7a51a5f9
2021-01-15configure: bump version for 1.8.7 releasePablo Neira Ayuso
Update libtool version for libxtables since two new interfaces have been added: - xtables_parse_mac_and_mask() - xtables_print_well_known_mac_and_mask() Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2021-01-15tests/shell: Fix nft-only/0009-needless-bitwise_0Phil Sutter
For whatever reason, stored expected output contains false handles. To overcome this, filter the rule data lines from both expected and stored output before comparing. Fixes: 81a2e12851283 ("tests/shell: Add test for bitwise avoidance fixes") Signed-off-by: Phil Sutter <phil@nwl.cc>
2020-12-21nft: Avoid pointless table/chain creationPhil Sutter
Accept a chain name in nft_xt_builtin_init() to limit the base chain creation to that specific chain only. Introduce nft_xt_builtin_table_init() to create just the table for situations where no builtin chains are needed but the command may still succeed in an empty ruleset, particularly when creating a custom chain, restoring base chains or adding a set for ebtables among match. Introduce nft_xt_fake_builtin_chains(), a function to call after cache has been populated to fill empty base chain slots. This keeps ruleset listing output intact if some base chains do not exist (or even the whole ruleset is completely empty). Signed-off-by: Phil Sutter <phil@nwl.cc>
2020-12-21tests: shell: Drop any dump sorting in placePhil Sutter
With iptables-nft-save output now sorted just like legacy one, no sorting to unify them is needed anymore. Signed-off-by: Phil Sutter <phil@nwl.cc>
2020-12-21nft: cache: Sort custom chains by namePhil Sutter
With base chains no longer residing in the tables' chain lists, they can easily be sorted upon insertion. This on one hand aligns custom chain ordering with legacy iptables and on the other makes it predictable, which is very helpful when manually comparing ruleset dumps for instance. Adjust the one ebtables-nft test case this change breaks (as wrong ordering is expected in there). The manual output sorting done for tests which apply to legacy as well as nft is removed in a separate patch. Signed-off-by: Phil Sutter <phil@nwl.cc>
2020-12-21nft: Introduce a dedicated base chain arrayPhil Sutter
Preparing for sorted chain output, introduce a per-table array holding base chains indexed by nf_inet_hooks value. Since the latter is ordered correctly, iterating over the array will return base chains in expected order. Signed-off-by: Phil Sutter <phil@nwl.cc>
2020-12-21nft: Introduce struct nft_chainPhil Sutter
Preparing for ordered output of user-defined chains, introduce a local datatype wrapping nftnl_chain. In order to maintain the chain name hash table, introduce nft_chain_list as well and use it instead of nftnl_chain_list. Signed-off-by: Phil Sutter <phil@nwl.cc>
2020-12-21nft: cache: Move nft_chain_find() overPhil Sutter
It is basically just a cache lookup, hence fits better in here. Signed-off-by: Phil Sutter <phil@nwl.cc>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 13:46:41 +0000