From 977af8c5acb67c9eb43fad64cd26c3f074604a24 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Tue, 8 Feb 2022 19:00:03 +0100 Subject: [PATCH] Add 'mctp' network domain keyword Reported as comment on https://build.opensuse.org/request/show/951354 (update to glibc 2.35) --- parser/apparmor.d.pod | 2 +- parser/base_af_names.h | 3 ++- utils/apparmor/rule/network.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/parser/apparmor.d.pod b/parser/apparmor.d.pod index 382e36daa..0b6637674 100644 --- a/parser/apparmor.d.pod +++ b/parser/apparmor.d.pod @@ -148,7 +148,7 @@ capabilities(7)) B = [ I ] 'network' [ I ] [ I | I ] -B = ( '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' | 'ib' | 'mpls' | 'can' | 'tipc' | 'bluetooth' | 'iucv' | 'rxrpc' | 'isdn' | 'phonet' | 'ieee802154' | 'caif' | 'alg' | 'nfc' | 'vsock' | 'kcm' | 'qipcrtr' | 'smc' | 'xdp' ) ',' +B = ( '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' | 'ib' | 'mpls' | 'can' | 'tipc' | 'bluetooth' | 'iucv' | 'rxrpc' | 'isdn' | 'phonet' | 'ieee802154' | 'caif' | 'alg' | 'nfc' | 'vsock' | 'kcm' | 'qipcrtr' | 'smc' | 'xdp' | 'mctp' ) ',' B = ( 'stream' | 'dgram' | 'seqpacket' | 'rdm' | 'raw' | 'packet' ) diff --git a/parser/base_af_names.h b/parser/base_af_names.h index 32e1ca758..9eb1089f6 100644 --- a/parser/base_af_names.h +++ b/parser/base_af_names.h @@ -42,4 +42,5 @@ AF_KCM 41, AF_QIPCRTR 42, AF_SMC 43, AF_XDP 44, -AF_MAX 45, +AF_MCTP 45, +AF_MAX 46, diff --git a/utils/apparmor/rule/network.py b/utils/apparmor/rule/network.py index 1acec8005..c2efc6b31 100644 --- a/utils/apparmor/rule/network.py +++ b/utils/apparmor/rule/network.py @@ -27,7 +27,7 @@ _ = 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', 'ib', 'mpls', 'can', 'tipc', 'bluetooth', 'iucv', 'rxrpc', 'isdn', - 'phonet', 'ieee802154', 'caif', 'alg', 'nfc', 'vsock', 'kcm', 'qipcrtr', 'smc', 'xdp' ] + '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']