libsepol/tests: adjust IPv6 netmasks
PATCH 1/1 libsepol/tests: adjust IPv6 netmasks
checkpolicy(8) since 01b88ac3 ("checkpolicy: warn on bogus IP address or netmask in nodecon statement") warns about host bits set in IPv6 addresses.
Adjust IPv6 netmasks in the libsepol tests so that the used address ::1 does not set any host bits and running the tests does not print several of the following warnings:
net_contexts:15:WARNING 'host bits in ipv6 address set' at token '' on line 594:
--- libsepol/tests/policies/test-deps/base-metreq.conf | 2 +- libsepol/tests/policies/test-deps/base-notmetreq.conf | 2 +- libsepol/tests/policies/test-deps/small-base.conf | 2 +- libsepol/tests/policies/test-expander/alias-base.conf | 2 +- libsepol/tests/policies/test-expander/role-base.conf | 2 +- libsepol/tests/policies/test-expander/small-base.conf | 2 +- libsepol/tests/policies/test-expander/user-base.conf | 2 +- libsepol/tests/policies/test-hooks/cmp_policy.conf | 2 +- libsepol/tests/policies/test-hooks/small-base.conf | 2 +- libsepol/tests/policies/test-linker/small-base.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)
libsepol/tests/policies/test-deps/base-metreq.conf +1 -1
@@ -516,7 +516,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)
libsepol/tests/policies/test-deps/base-notmetreq.conf +1 -1
@@ -503,7 +503,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)
libsepol/tests/policies/test-deps/small-base.conf +1 -1
@@ -504,7 +504,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)
libsepol/tests/policies/test-expander/alias-base.conf +1 -1
@@ -494,7 +494,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)
libsepol/tests/policies/test-expander/role-base.conf +1 -1
@@ -476,7 +476,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)
libsepol/tests/policies/test-expander/small-base.conf +1 -1
@@ -714,7 +714,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)
libsepol/tests/policies/test-expander/user-base.conf +1 -1
@@ -480,7 +480,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)
libsepol/tests/policies/test-hooks/cmp_policy.conf +1 -1
@@ -464,7 +464,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0)
libsepol/tests/policies/test-hooks/small-base.conf +1 -1
@@ -464,7 +464,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0)
libsepol/tests/policies/test-linker/small-base.conf +1 -1
@@ -593,7 +593,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0)
Signature · 1 line
2.35.2
Quoted 11 lines · Christian Göttsche
checkpolicy(8) since
01b88ac3("checkpolicy: warn on bogus IP address or netmask in nodecon statement") warns about host bits set in IPv6 addresses.
Adjust IPv6 netmasks in the libsepol tests so that the used address ::1 does not set any host bits and running the tests does not print several of the following warnings:net_contexts:15:WARNING 'host bits in ipv6 address set' at token '' on line 594:
Signed-off-by Christian Göttsche <[email protected]>
Quoted 146 lines
--- libsepol/tests/policies/test-deps/base-metreq.conf | 2 +- libsepol/tests/policies/test-deps/base-notmetreq.conf | 2 +- libsepol/tests/policies/test-deps/small-base.conf | 2 +- libsepol/tests/policies/test-expander/alias-base.conf | 2 +- libsepol/tests/policies/test-expander/role-base.conf | 2 +- libsepol/tests/policies/test-expander/small-base.conf | 2 +- libsepol/tests/policies/test-expander/user-base.conf | 2 +- libsepol/tests/policies/test-hooks/cmp_policy.conf | 2 +- libsepol/tests/policies/test-hooks/small-base.conf | 2 +- libsepol/tests/policies/test-linker/small-base.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)libsepol/tests/policies/test-deps/base-metreq.conf +1
-1@@ -516,7 +516,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)libsepol/tests/policies/test-deps/base-notmetreq.conf +1
-1@@ -503,7 +503,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)libsepol/tests/policies/test-deps/small-base.conf +1
-1@@ -504,7 +504,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)libsepol/tests/policies/test-expander/alias-base.conf +1
-1@@ -494,7 +494,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)libsepol/tests/policies/test-expander/role-base.conf +1
-1@@ -476,7 +476,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)libsepol/tests/policies/test-expander/small-base.conf +1
-1@@ -714,7 +714,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)libsepol/tests/policies/test-expander/user-base.conf +1
-1@@ -480,7 +480,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)libsepol/tests/policies/test-hooks/cmp_policy.conf +1
-1@@ -464,7 +464,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0)libsepol/tests/policies/test-hooks/small-base.conf +1
-1@@ -464,7 +464,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0)libsepol/tests/policies/test-linker/small-base.conf +1
-2@@ -593,7 +593,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0) --2.35.2
Quoted 11 lines · James Carter
Quoted 8 lines · Christian Göttsche
checkpolicy(8) since
01b88ac3("checkpolicy: warn on bogus IP address or netmask in nodecon statement") warns about host bits set in IPv6 addresses.
Adjust IPv6 netmasks in the libsepol tests so that the used address ::1 does not set any host bits and running the tests does not print several of the following warnings:
Quoted 6 lines
Quoted 3 lines
net_contexts:15:WARNING 'host bits in ipv6 address set' at token '' on line 594:
Signed-off-by Christian Göttsche <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Thanks,
Jim
Quoted 146 lines
Quoted 146 lines
--- libsepol/tests/policies/test-deps/base-metreq.conf | 2 +- libsepol/tests/policies/test-deps/base-notmetreq.conf | 2 +- libsepol/tests/policies/test-deps/small-base.conf | 2 +- libsepol/tests/policies/test-expander/alias-base.conf | 2 +- libsepol/tests/policies/test-expander/role-base.conf | 2 +- libsepol/tests/policies/test-expander/small-base.conf | 2 +- libsepol/tests/policies/test-expander/user-base.conf | 2 +- libsepol/tests/policies/test-hooks/cmp_policy.conf | 2 +- libsepol/tests/policies/test-hooks/small-base.conf | 2 +- libsepol/tests/policies/test-linker/small-base.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-)libsepol/tests/policies/test-deps/base-metreq.conf +1
-1@@ -516,7 +516,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)libsepol/tests/policies/test-deps/base-notmetreq.conf +1
-1@@ -503,7 +503,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)libsepol/tests/policies/test-deps/small-base.conf +1
-1@@ -504,7 +504,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)libsepol/tests/policies/test-expander/alias-base.conf +1
-1@@ -494,7 +494,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)libsepol/tests/policies/test-expander/role-base.conf +1
-1@@ -476,7 +476,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)libsepol/tests/policies/test-expander/small-base.conf +1
-1@@ -714,7 +714,7 @@ genfscon proc / gen_context(system_u:object_r:sys_foo_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:net_foo_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:net_foo_t, s0)libsepol/tests/policies/test-expander/user-base.conf +1
-1@@ -480,7 +480,7 @@ genfscon proc / gen_context(system_u:object_r:system_t, s0) # #nodecon 127.0.0.1 255.255.255.255 system_u:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(system_u:object_r:system_t, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(system_u:object_r:system_t, s0)libsepol/tests/policies/test-hooks/cmp_policy.conf +1
-1@@ -464,7 +464,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0)libsepol/tests/policies/test-hooks/small-base.conf +1
-1@@ -464,7 +464,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0)libsepol/tests/policies/test-linker/small-base.conf +1
-2@@ -593,7 +593,7 @@ genfscon proc / gen_context(g_b_user_1:object_r:g_b_type_1, s0) # #nodecon 127.0.0.1 255.255.255.255 g_b_user_1:object_r:net_foo_t:s0 -nodecon ::1 FFFF:FFFF:FFFF:FFFF:: gen_context(g_b_user_1:object_r:g_b_type_1, s0) +nodecon ::1 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF gen_context(g_b_user_1:object_r:g_b_type_1, s0) --2.35.2