Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20211011142416.26798-1-fw@strlen.de>
In-Reply-To: <20211011142416.26798-1-fw@strlen.de>
From:   Paul Moore <paul@paul-moore.com>
Date:   Mon, 11 Oct 2021 13:09:58 -0400
Message-ID: <CAHC9VhRBYMMSucVbqUkcWTtyeuJ7SSuzDED=Cg=svWiaByo3Qw@mail.gmail.com>
Subject: Re: [PATCH v2 selinux] selinux: remove unneeded ipv6 hook wrappers
To:     Florian Westphal <fw@strlen.de>
Cc:     selinux@vger.kernel.org,
        Stephen Smalley <stephen.smalley.work@gmail.com>,
        Eric Paris <eparis@parisplace.org>,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Oct 11, 2021 at 10:25 AM Florian Westphal <fw@strlen.de> wrote:
>
> Netfilter places the protocol number the hook function is getting called
> from in state->pf, so we can use that instead of an extra wrapper.
>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
>  v2: add back '#endif /* CONFIG_NETFILTER */' erronously axed in v1.
>  Applies to 'next' branch of
>  https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git/
>
>  security/selinux/hooks.c | 52 ++++++++++------------------------------
>  1 file changed, 12 insertions(+), 40 deletions(-)

...

> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index e7ebd45ca345..831b857d5dd7 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -7470,38 +7442,38 @@ DEFINE_LSM(selinux) = {
>
>  static const struct nf_hook_ops selinux_nf_ops[] = {
>         {
> -               .hook =         selinux_ipv4_postroute,
> +               .hook =         selinux_hook_postroute,
>                 .pf =           NFPROTO_IPV4,
>                 .hooknum =      NF_INET_POST_ROUTING,
>                 .priority =     NF_IP_PRI_SELINUX_LAST,
>         },

Thanks for the patch Florian, although the name "selinux_hook_*" seems
a bit ambiguous to me, after all we have a little more than 200
"hooks" in the SELinux LSM implementation.  Would you be okay with
calling the netfilter hook functions "selinux_nf_*" or something
similar?  If you don't have time I can do the rename during the merge
assuming we can all agree on a name.

-- 
paul moore
www.paul-moore.com