![Pablo Neira Ayuso](/assets/img/avatar_default.png)
This patch adds the x_tables compatibility layer. This allows you to use existing x_tables matches and targets from nf_tables. This compatibility later allows us to use existing matches/targets for features that are still missing in nf_tables. We can progressively replace them with native nf_tables extensions. It also provides the userspace compatibility software that allows you to express the rule-set using the iptables syntax but using the nf_tables kernel components. In order to get this compatibility layer working, I've done the following things: * add NFNL_SUBSYS_NFT_COMPAT: this new nfnetlink subsystem is used to query the x_tables match/target revision, so we don't need to use the native x_table getsockopt interface. * emulate xt structures: this required extending the struct nft_pktinfo to include the fragment offset, which is already obtained from ip[6]_tables and that is used by some matches/targets. * add support for default policy to base chains, required to emulate x_tables. * add NFTA_CHAIN_USE attribute to obtain the number of references to chains, required by x_tables emulation. * add chain packet/byte counters using per-cpu. * support 32-64 bits compat. For historical reasons, this patch includes the following patches that were posted in the netfilter-devel mailing list. From Pablo Neira Ayuso: * nf_tables: add default policy to base chains * netfilter: nf_tables: add NFTA_CHAIN_USE attribute * nf_tables: nft_compat: private data of target and matches in contiguous area * nf_tables: validate hooks for compat match/target * nf_tables: nft_compat: release cached matches/targets * nf_tables: x_tables support as a compile time option * nf_tables: fix alias for xtables over nftables module * nf_tables: add packet and byte counters per chain * nf_tables: fix per-chain counter stats if no counters are passed * nf_tables: don't bump chain stats * nf_tables: add protocol and flags for xtables over nf_tables * nf_tables: add ip[6]t_entry emulation * nf_tables: move specific layer 3 compat code to nf_tables_ipv[4|6] * nf_tables: support 32bits-64bits x_tables compat * nf_tables: fix compilation if CONFIG_COMPAT is disabled From Patrick McHardy: * nf_tables: move policy to struct nft_base_chain * nf_tables: send notifications for base chain policy changes From Alexander Primak: * nf_tables: remove the duplicate NF_INET_LOCAL_OUT From Nicolas Dichtel: * nf_tables: fix compilation when nf-netlink is a module Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
133 lines
3.4 KiB
C
133 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 2008-2009 Patrick McHardy <kaber@trash.net>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* Development of this code funded by Astaro AG (http://www.astaro.com/)
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/netlink.h>
|
|
#include <linux/netfilter.h>
|
|
#include <linux/netfilter/nf_tables.h>
|
|
#include <net/netfilter/nf_tables_core.h>
|
|
#include <net/netfilter/nf_tables.h>
|
|
|
|
struct nft_immediate_expr {
|
|
struct nft_data data;
|
|
enum nft_registers dreg:8;
|
|
u8 dlen;
|
|
};
|
|
|
|
static void nft_immediate_eval(const struct nft_expr *expr,
|
|
struct nft_data data[NFT_REG_MAX + 1],
|
|
const struct nft_pktinfo *pkt)
|
|
{
|
|
const struct nft_immediate_expr *priv = nft_expr_priv(expr);
|
|
|
|
nft_data_copy(&data[priv->dreg], &priv->data);
|
|
}
|
|
|
|
static const struct nla_policy nft_immediate_policy[NFTA_IMMEDIATE_MAX + 1] = {
|
|
[NFTA_IMMEDIATE_DREG] = { .type = NLA_U32 },
|
|
[NFTA_IMMEDIATE_DATA] = { .type = NLA_NESTED },
|
|
};
|
|
|
|
static int nft_immediate_init(const struct nft_ctx *ctx,
|
|
const struct nft_expr *expr,
|
|
const struct nlattr * const tb[])
|
|
{
|
|
struct nft_immediate_expr *priv = nft_expr_priv(expr);
|
|
struct nft_data_desc desc;
|
|
int err;
|
|
|
|
if (tb[NFTA_IMMEDIATE_DREG] == NULL ||
|
|
tb[NFTA_IMMEDIATE_DATA] == NULL)
|
|
return -EINVAL;
|
|
|
|
priv->dreg = ntohl(nla_get_be32(tb[NFTA_IMMEDIATE_DREG]));
|
|
err = nft_validate_output_register(priv->dreg);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
err = nft_data_init(ctx, &priv->data, &desc, tb[NFTA_IMMEDIATE_DATA]);
|
|
if (err < 0)
|
|
return err;
|
|
priv->dlen = desc.len;
|
|
|
|
err = nft_validate_data_load(ctx, priv->dreg, &priv->data, desc.type);
|
|
if (err < 0)
|
|
goto err1;
|
|
|
|
return 0;
|
|
|
|
err1:
|
|
nft_data_uninit(&priv->data, desc.type);
|
|
return err;
|
|
}
|
|
|
|
static void nft_immediate_destroy(const struct nft_expr *expr)
|
|
{
|
|
const struct nft_immediate_expr *priv = nft_expr_priv(expr);
|
|
return nft_data_uninit(&priv->data, nft_dreg_to_type(priv->dreg));
|
|
}
|
|
|
|
static int nft_immediate_dump(struct sk_buff *skb, const struct nft_expr *expr)
|
|
{
|
|
const struct nft_immediate_expr *priv = nft_expr_priv(expr);
|
|
|
|
if (nla_put_be32(skb, NFTA_IMMEDIATE_DREG, htonl(priv->dreg)))
|
|
goto nla_put_failure;
|
|
|
|
return nft_data_dump(skb, NFTA_IMMEDIATE_DATA, &priv->data,
|
|
nft_dreg_to_type(priv->dreg), priv->dlen);
|
|
|
|
nla_put_failure:
|
|
return -1;
|
|
}
|
|
|
|
static int nft_immediate_validate(const struct nft_ctx *ctx,
|
|
const struct nft_expr *expr,
|
|
const struct nft_data **data)
|
|
{
|
|
const struct nft_immediate_expr *priv = nft_expr_priv(expr);
|
|
|
|
if (priv->dreg == NFT_REG_VERDICT)
|
|
*data = &priv->data;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct nft_expr_type nft_imm_type;
|
|
static const struct nft_expr_ops nft_imm_ops = {
|
|
.type = &nft_imm_type,
|
|
.size = NFT_EXPR_SIZE(sizeof(struct nft_immediate_expr)),
|
|
.eval = nft_immediate_eval,
|
|
.init = nft_immediate_init,
|
|
.destroy = nft_immediate_destroy,
|
|
.dump = nft_immediate_dump,
|
|
.validate = nft_immediate_validate,
|
|
};
|
|
|
|
static struct nft_expr_type nft_imm_type __read_mostly = {
|
|
.name = "immediate",
|
|
.ops = &nft_imm_ops,
|
|
.policy = nft_immediate_policy,
|
|
.maxattr = NFTA_IMMEDIATE_MAX,
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
int __init nft_immediate_module_init(void)
|
|
{
|
|
return nft_register_expr(&nft_imm_type);
|
|
}
|
|
|
|
void nft_immediate_module_exit(void)
|
|
{
|
|
nft_unregister_expr(&nft_imm_type);
|
|
}
|