Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fba05d25 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nft_osf: restrict osf to ipv4, ipv6 and inet families 



[ Upstream commit 5f3b7aae14a706d0d7da9f9e39def52ff5fc3d39 ]

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

Fixes: b96af92d ("netfilter: nf_tables: implement Passive OS fingerprint module in nft_osf")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a2ce367a

net/netfilter/nft_osf.c

+15 −3
Original line number Diff line number Diff line
@@ -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) |

	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));

			(1 << NF_INET_FORWARD);

		break;

	default:

		return -EOPNOTSUPP;

	}



	return nft_chain_validate_hooks(ctx->chain, hooks);

}



static struct nft_expr_type nft_osf_type;