Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

apparmor: remove unneeded one-line hook wrappers

Use the common function directly.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: John Johansen <john.johansen@canonical.com>

authored by

Florian Westphal and committed by
John Johansen
7b721124 f4a2d282

+2 -18
+2 -18
security/apparmor/lsm.c
··· 1763 1763 1764 1764 } 1765 1765 1766 - static unsigned int apparmor_ipv4_postroute(void *priv, 1767 - struct sk_buff *skb, 1768 - const struct nf_hook_state *state) 1769 - { 1770 - return apparmor_ip_postroute(priv, skb, state); 1771 - } 1772 - 1773 - #if IS_ENABLED(CONFIG_IPV6) 1774 - static unsigned int apparmor_ipv6_postroute(void *priv, 1775 - struct sk_buff *skb, 1776 - const struct nf_hook_state *state) 1777 - { 1778 - return apparmor_ip_postroute(priv, skb, state); 1779 - } 1780 - #endif 1781 - 1782 1766 static const struct nf_hook_ops apparmor_nf_ops[] = { 1783 1767 { 1784 - .hook = apparmor_ipv4_postroute, 1768 + .hook = apparmor_ip_postroute, 1785 1769 .pf = NFPROTO_IPV4, 1786 1770 .hooknum = NF_INET_POST_ROUTING, 1787 1771 .priority = NF_IP_PRI_SELINUX_FIRST, 1788 1772 }, 1789 1773 #if IS_ENABLED(CONFIG_IPV6) 1790 1774 { 1791 - .hook = apparmor_ipv6_postroute, 1775 + .hook = apparmor_ip_postroute, 1792 1776 .pf = NFPROTO_IPV6, 1793 1777 .hooknum = NF_INET_POST_ROUTING, 1794 1778 .priority = NF_IP6_PRI_SELINUX_FIRST,