lkml.org 
[lkml]   [2022]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 060/136] netfilter: nft_osf: restrict osf to ipv4, ipv6 and inet families
    Date
    From: Pablo Neira Ayuso <pablo@netfilter.org>

    [ Upstream commit 5f3b7aae14a706d0d7da9f9e39def52ff5fc3d39 ]

    As it was originally intended, restrict extension to supported families.

    Fixes: b96af92d6eaf ("netfilter: nf_tables: implement Passive OS fingerprint module in nft_osf")
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nft_osf.c | 18 +++++++++++++++---
    1 file changed, 15 insertions(+), 3 deletions(-)

    diff --git a/net/netfilter/nft_osf.c b/net/netfilter/nft_osf.c
    index d82677e83400b..720dc9fba6d4f 100644
    --- a/net/netfilter/nft_osf.c
    +++ b/net/netfilter/nft_osf.c
    @@ -115,9 +115,21 @@ static int nft_osf_validate(const struct nft_ctx *ctx,
    const struct nft_expr *expr,
    const struct nft_data **data)
    {
    - return nft_chain_validate_hooks(ctx->chain, (1 << NF_INET_LOCAL_IN) |
    - (1 << NF_INET_PRE_ROUTING) |
    - (1 << NF_INET_FORWARD));
    + unsigned int hooks;
    +
    + switch (ctx->family) {
    + case NFPROTO_IPV4:
    + case NFPROTO_IPV6:
    + case NFPROTO_INET:
    + hooks = (1 << NF_INET_LOCAL_IN) |
    + (1 << NF_INET_PRE_ROUTING) |
    + (1 << NF_INET_FORWARD);
    + break;
    + default:
    + return -EOPNOTSUPP;
    + }
    +
    + return nft_chain_validate_hooks(ctx->chain, hooks);
    }

    static struct nft_expr_type nft_osf_type;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-29 13:08    [W:4.213 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site