OSDN Git Service

apparmor: Fix warning about unused function apparmor_ipv6_postroute
authorPetr Vorel <pvorel@suse.cz>
Mon, 12 Nov 2018 10:59:12 +0000 (11:59 +0100)
committerJohn Johansen <john.johansen@canonical.com>
Fri, 1 Feb 2019 12:12:57 +0000 (04:12 -0800)
when compiled without CONFIG_IPV6:
security/apparmor/lsm.c:1601:21: warning: â€˜apparmor_ipv6_postroute’ defined but not used [-Wunused-function]
 static unsigned int apparmor_ipv6_postroute(void *priv,
                     ^~~~~~~~~~~~~~~~~~~~~~~

Reported-by: Jordan Glover <Golden_Miller83@protonmail.ch>
Tested-by: Jordan Glover <Golden_Miller83@protonmail.ch>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/lsm.c

index 2c01087..8db1731 100644 (file)
@@ -1599,12 +1599,14 @@ static unsigned int apparmor_ipv4_postroute(void *priv,
        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[] = {
        {