From 19daf74dc6ffef25770285a16461a1ee6a6c90fc Mon Sep 17 00:00:00 2001 From: John Johansen Date: Mon, 22 Aug 2022 21:44:14 +0000 Subject: [PATCH] Merge [2.11..2.13] Add 'mctp' network domain keyword [only to utils] Reported as comment on https://build.opensuse.org/request/show/951354 (update to glibc 2.35) This is a partial backport of https://gitlab.com/apparmor/apparmor/-/merge_requests/832 I propose this patch for 2.11, 2.12 and 2.13. MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/911 Approved-by: John Johansen Merged-by: John Johansen (cherry picked from commit 157c8ee36a09330601ec7667e8ead6d58d2ef4c8) Signed-off-by: John Johansen --- utils/apparmor/rule/network.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/apparmor/rule/network.py b/utils/apparmor/rule/network.py index 6ba76907e..c2efc6b31 100644 --- a/utils/apparmor/rule/network.py +++ b/utils/apparmor/rule/network.py @@ -26,8 +26,8 @@ _ = init_translation() network_domain_keywords = [ 'unspec', 'unix', 'inet', 'ax25', 'ipx', 'appletalk', 'netrom', 'bridge', 'atmpvc', 'x25', 'inet6', 'rose', 'netbeui', 'security', 'key', 'netlink', 'packet', 'ash', 'econet', 'atmsvc', 'rds', 'sna', - 'irda', 'pppox', 'wanpipe', 'llc', 'can', 'tipc', 'bluetooth', 'iucv', 'rxrpc', 'isdn', 'phonet', - 'ieee802154', 'caif', 'alg', 'nfc', 'vsock', 'mpls', 'ib', 'kcm', 'smc' ] + 'irda', 'pppox', 'wanpipe', 'llc', 'ib', 'mpls', 'can', 'tipc', 'bluetooth', 'iucv', 'rxrpc', 'isdn', + 'phonet', 'ieee802154', 'caif', 'alg', 'nfc', 'vsock', 'kcm', 'qipcrtr', 'smc', 'xdp', 'mctp' ] network_type_keywords = ['stream', 'dgram', 'seqpacket', 'rdm', 'raw', 'packet'] network_protocol_keywords = ['tcp', 'udp', 'icmp']