diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-06-14 15:06:27 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-06-22 22:23:58 +0900 |
commit | b48ed70c79c6482e1f39b77d16e62043ff5042a5 (patch) | |
tree | 58245c4075beb60a8558020b647dc67134beb68e /test | |
parent | 127b26f3d8b589907ed75a34d34ab330995778f9 (diff) | |
download | systemd-b48ed70c79c6482e1f39b77d16e62043ff5042a5.tar.gz |
Revert NFTSet feature
This reverts PR #22587 and its follow-up commit. More specifically,
2299b1cae32c1fb8911da0ce26efced68032f4f8 (partially),
e176f855278d5098d3fecc5aa24ba702147d42e0,
ceb46a31a01b3d3d1d6095d857e29ea214a2776b, and
51bb9076ab8c050bebb64db5035852385accda35.
The PR was merged without final approval, and has several issues:
- OSS fuzz reported issues in the conf parser,
- It calls synchrnous netlink call, it should not be especially in PID1,
- The importance of NFTSet for CGroup and DynamicUser may be
questionable, at least, there was no justification PID1 should support
it.
- For networkd, it should be implemented with Request object,
- There is no test for the feature.
Fixes #23711.
Fixes #23717.
Fixes #23719.
Fixes #23720.
Fixes #23721.
Fixes #23759.
Diffstat (limited to 'test')
-rw-r--r-- | test/fuzz/fuzz-network-parser/directives | 6 | ||||
-rw-r--r-- | test/fuzz/fuzz-unit-file/directives.mount | 2 | ||||
-rw-r--r-- | test/fuzz/fuzz-unit-file/directives.scope | 1 | ||||
-rw-r--r-- | test/fuzz/fuzz-unit-file/directives.service | 2 | ||||
-rw-r--r-- | test/fuzz/fuzz-unit-file/directives.slice | 1 | ||||
-rw-r--r-- | test/fuzz/fuzz-unit-file/directives.socket | 2 | ||||
-rw-r--r-- | test/fuzz/fuzz-unit-file/directives.swap | 2 |
7 files changed, 0 insertions, 16 deletions
diff --git a/test/fuzz/fuzz-network-parser/directives b/test/fuzz/fuzz-network-parser/directives index 803f0d1969..0b850cdfcf 100644 --- a/test/fuzz/fuzz-network-parser/directives +++ b/test/fuzz/fuzz-network-parser/directives @@ -132,7 +132,6 @@ RouteMTUBytes= FallbackLeaseLifetimeSec= Use6RD= NetLabel= -NFTSet= [DHCPv6] UseAddress= UseDelegatedPrefix= @@ -155,7 +154,6 @@ IAID= DUIDType= DUIDRawData= NetLabel= -NFTSet= [DHCPv6PrefixDelegation] SubnetId= Announce= @@ -173,7 +171,6 @@ ManageTemporaryAddress= Token= RouteMetric= NetLabel= -NFTSet= [Route] Destination= Protocol= @@ -260,8 +257,6 @@ DHCPv6PrefixDelegation= DHCPPrefixDelegation= BatmanAdvanced= IPoIB= -IPv4NFTSet= -IPv6NFTSet= [IPv6Prefix] Prefix= OnLink= @@ -353,7 +348,6 @@ Managed= OtherInformation= UplinkInterface= NetLabel= -NFTSet= [IPv6PrefixDelegation] RouterPreference= DNSLifetimeSec= diff --git a/test/fuzz/fuzz-unit-file/directives.mount b/test/fuzz/fuzz-unit-file/directives.mount index 16d2138a04..0a44328e5c 100644 --- a/test/fuzz/fuzz-unit-file/directives.mount +++ b/test/fuzz/fuzz-unit-file/directives.mount @@ -28,7 +28,6 @@ Capabilities= CapabilityBoundingSet= ConfigurationDirectory= ConfigurationDirectoryMode= -ControlGroupNFTSet= CoredumpFilter= DefaultMemoryLow= DefaultMemoryMin= @@ -38,7 +37,6 @@ DevicePolicy= DirectoryMode= DisableControllers= DynamicUser= -DynamicUserNFTSet= Environment= EnvironmentFile= ExecPaths= diff --git a/test/fuzz/fuzz-unit-file/directives.scope b/test/fuzz/fuzz-unit-file/directives.scope index c4d579065a..4552d0b403 100644 --- a/test/fuzz/fuzz-unit-file/directives.scope +++ b/test/fuzz/fuzz-unit-file/directives.scope @@ -8,7 +8,6 @@ BlockIODeviceWeight= BlockIOReadBandwidth= BlockIOWeight= BlockIOWriteBandwidth= -ControlGroupNFTSet= CPUAccounting= CPUQuota= CPUQuotaPeriodSec= diff --git a/test/fuzz/fuzz-unit-file/directives.service b/test/fuzz/fuzz-unit-file/directives.service index 511c2f6b4f..3c33d947fe 100644 --- a/test/fuzz/fuzz-unit-file/directives.service +++ b/test/fuzz/fuzz-unit-file/directives.service @@ -72,7 +72,6 @@ ConditionSecurity= ConditionUser= ConditionVirtualization= Conflicts= -ControlGroupNFTSet= DefaultDependencies= Description= Documentation= @@ -160,7 +159,6 @@ DeviceAllow= DevicePolicy= DisableControllers= DynamicUser= -DynamicUserNFTSet= Environment= EnvironmentFile= ExecCondition= diff --git a/test/fuzz/fuzz-unit-file/directives.slice b/test/fuzz/fuzz-unit-file/directives.slice index 749f1795e3..ab77070c5e 100644 --- a/test/fuzz/fuzz-unit-file/directives.slice +++ b/test/fuzz/fuzz-unit-file/directives.slice @@ -8,7 +8,6 @@ BlockIODeviceWeight= BlockIOReadBandwidth= BlockIOWeight= BlockIOWriteBandwidth= -ControlGroupNFTSet= CPUAccounting= CPUQuota= CPUQuotaPeriodSec= diff --git a/test/fuzz/fuzz-unit-file/directives.socket b/test/fuzz/fuzz-unit-file/directives.socket index b9ad5e5f84..90358fc11a 100644 --- a/test/fuzz/fuzz-unit-file/directives.socket +++ b/test/fuzz/fuzz-unit-file/directives.socket @@ -33,7 +33,6 @@ Capabilities= CapabilityBoundingSet= ConfigurationDirectory= ConfigurationDirectoryMode= -ControlGroupNFTSet= CoredumpFilter= DefaultMemoryLow= DefaultMemoryMin= @@ -44,7 +43,6 @@ DevicePolicy= DirectoryMode= DisableControllers= DynamicUser= -DynamicUserNFTSet= Environment= EnvironmentFile= ExecPaths= diff --git a/test/fuzz/fuzz-unit-file/directives.swap b/test/fuzz/fuzz-unit-file/directives.swap index 4721edce4b..5d057fa630 100644 --- a/test/fuzz/fuzz-unit-file/directives.swap +++ b/test/fuzz/fuzz-unit-file/directives.swap @@ -28,7 +28,6 @@ Capabilities= CapabilityBoundingSet= ConfigurationDirectory= ConfigurationDirectoryMode= -ControlGroupNFTSet= CoredumpFilter= DefaultMemoryLow= DefaultMemoryMin= @@ -37,7 +36,6 @@ DeviceAllow= DevicePolicy= DisableControllers= DynamicUser= -DynamicUserNFTSet= Environment= EnvironmentFile= ExecPaths= |