Messages in this thread Patch in this message | | | From | Florian Westphal <> | Subject | [PATCH apparmor] apparmor: remove unneeded one-line hook wrappers | Date | Mon, 11 Oct 2021 16:38:54 +0200 |
| |
Use the common function directly.
Signed-off-by: Florian Westphal <fw@strlen.de> --- security/apparmor/lsm.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index f72406fe1bf2..eafb44aa553a 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1773,32 +1773,16 @@ static unsigned int apparmor_ip_postroute(void *priv, } -static unsigned int apparmor_ipv4_postroute(void *priv, - struct sk_buff *skb, - const struct nf_hook_state *state) -{ - return apparmor_ip_postroute(priv, skb, state); -} - -#if IS_ENABLED(CONFIG_IPV6) -static unsigned int apparmor_ipv6_postroute(void *priv, - struct sk_buff *skb, - const struct nf_hook_state *state) -{ - return apparmor_ip_postroute(priv, skb, state); -} -#endif - static const struct nf_hook_ops apparmor_nf_ops[] = { { - .hook = apparmor_ipv4_postroute, + .hook = apparmor_ip_postroute, .pf = NFPROTO_IPV4, .hooknum = NF_INET_POST_ROUTING, .priority = NF_IP_PRI_SELINUX_FIRST, }, #if IS_ENABLED(CONFIG_IPV6) { - .hook = apparmor_ipv6_postroute, + .hook = apparmor_ip_postroute, .pf = NFPROTO_IPV6, .hooknum = NF_INET_POST_ROUTING, .priority = NF_IP6_PRI_SELINUX_FIRST, -- 2.32.0
| |