Skip to contentSkip to conversation

libselpol: Sort portcon rules consistently

PATCH Applied James Carter 2 participants 4 messages May 28, 2020 – Jun 2, 2020 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libselpol: Sort portcon rules consistently

The comparison function, portcon_data_cmp(), only made use of the protocol to put tcp before udp, dccp, and sctp. Rules that have the same port range, but with different protocols would be considered equal unless one of the protocols was tcp. When generating a CIL or conf source policy from a binary or using the "-S" option in checkpolicy the non-tcp portcon rules with the same port range would not be consistently sorted.

Changed portcon_data_cmp() to sort portcon rules like the CIL function cil_post_portcon_compare().

---
 libsepol/src/kernel_to_common.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
libsepol/src/kernel_to_common.c +2 -4
index 7b53c92f..a7453d3c 100644
@@ -470,11 +470,9 @@ static int portcon_data_cmp(const void *a, const void *b)
 	rc = compare_ranges((*aa)->u.port.low_port, (*aa)->u.port.high_port,
 			    (*bb)->u.port.low_port, (*bb)->u.port.high_port);
 	if (rc == 0) {
-		if ((*aa)->u.port.protocol == (*bb)->u.port.protocol) {
-			rc = 0;
-		} else if ((*aa)->u.port.protocol == IPPROTO_TCP) {
+		if ((*aa)->u.port.protocol < (*bb)->u.port.protocol) {
 			rc = -1;
-		} else {
+		} else if ((*aa)->u.port.protocol > (*bb)->u.port.protocol) {
 			rc = 1;
 		}
 	}
Signature · 1 line
2.25.4
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · James Carter

The comparison function, portcon_data_cmp(), only made use of the protocol to put tcp before udp, dccp, and sctp. Rules that have the same port range, but with different protocols would be considered equal unless one of the protocols was tcp. When generating a CIL or conf source policy from a binary or using the "-S" option in checkpolicy the non-tcp portcon rules with the same port range would not be consistently sorted.

Quoted 5 lines

Changed portcon_data_cmp() to sort portcon rules like the CIL function cil_post_portcon_compare().

Any idea why it used that logic previously? And how does this compare with sepol_port_compare/compare2() used by libsemanage? Regardless,

#2 lore raw
Quoted 11 lines · Stephen Smalley
Quoted 9 lines · James Carter

The comparison function, portcon_data_cmp(), only made use of the protocol to put tcp before udp, dccp, and sctp. Rules that have the same port range, but with different protocols would be considered equal unless one of the protocols was tcp. When generating a CIL or conf source policy from a binary or using the "-S" option in checkpolicy the non-tcp portcon rules with the same port range would not be consistently sorted.

Quoted 8 lines
Quoted 5 lines

Changed portcon_data_cmp() to sort portcon rules like the CIL function cil_post_portcon_compare().

Any idea why it used that logic previously? And how does this compare with sepol_port_compare/compare2() used by libsemanage?

It originally followed the logic in CIL. I updated the CIL logic in 2018 (see commit 4ba19b541 ("libsepol/cil: Improve processing of context rules"), but failed to update the logic in kernel_to_common.

The logic is similar, but slightly different. The logic in CIL and in kernel_to_common puts smaller port ranges before larger ones, but sepol_port_compare/compare2() do not take into account the port range. Other than that they are the same (with this patch). I am not sure where the CIL ordering logic came from, Steve Lawrence might remember.

Jim

Quoted 2 lines

Regardless,

maintainer Applied
#3 lore raw
Quoted 27 lines · James Carter
Quoted 11 lines · Stephen Smalley
Quoted 9 lines · James Carter

The comparison function, portcon_data_cmp(), only made use of the protocol to put tcp before udp, dccp, and sctp. Rules that have the same port range, but with different protocols would be considered equal unless one of the protocols was tcp. When generating a CIL or conf source policy from a binary or using the "-S" option in checkpolicy the non-tcp portcon rules with the same port range would not be consistently sorted.

Quoted 8 lines
Quoted 5 lines

Changed portcon_data_cmp() to sort portcon rules like the CIL function cil_post_portcon_compare().

Any idea why it used that logic previously? And how does this compare with sepol_port_compare/compare2() used by libsemanage?

It originally followed the logic in CIL. I updated the CIL logic in 2018 (see commit 4ba19b541 ("libsepol/cil: Improve processing of context rules"), but failed to update the logic in kernel_to_common.

Quoted 10 lines

The logic is similar, but slightly different. The logic in CIL and in kernel_to_common puts smaller port ranges before larger ones, but sepol_port_compare/compare2() do not take into account the port range. Other than that they are the same (with this patch). I am not sure where the CIL ordering logic came from, Steve Lawrence might remember.

Jim

Quoted 2 lines

Regardless,

Applied.