Subject: Re: [PATCH apparmor] apparmor: remove unneeded one-line hook wrappers
To:     Florian Westphal <fw@strlen.de>,
        linux-security-module@vger.kernel.org
Cc:     jmorris@namei.org, serge@hallyn.com, linux-kernel@vger.kernel.org
References: <20211011143854.17917-1-fw@strlen.de>
From:   John Johansen <john.johansen@canonical.com>
Organization: Canonical
Message-ID: <0525571e-9950-b953-f6df-e6a81f5c54cc@canonical.com>
Date:   Thu, 11 Nov 2021 17:26:06 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.13.0
MIME-Version: 1.0
In-Reply-To: <20211011143854.17917-1-fw@strlen.de>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 10/11/21 7:38 AM, Florian Westphal wrote:
> Use the common function directly.
> 
> Signed-off-by: Florian Westphal <fw@strlen.de>

sorry, it looks like I forgot to reply to this. I pulled this into the
apparmor tree and it has been merged for 5.16

> ---
>  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,
>