2c64605b59
net/netfilter/nft_fwd_netdev.c: In function ‘nft_fwd_netdev_eval’:
net/netfilter/nft_fwd_netdev.c:32:10: error: ‘struct sk_buff’ has no member named ‘tc_redirected’
pkt->skb->tc_redirected = 1;
^~
net/netfilter/nft_fwd_netdev.c:33:10: error: ‘struct sk_buff’ has no member named ‘tc_from_ingress’
pkt->skb->tc_from_ingress = 1;
^~
To avoid a direct dependency with tc actions from netfilter, wrap the
redirect bits around CONFIG_NET_REDIRECT and move helpers to
include/linux/skbuff.h. Turn on this toggle from the ifb driver, the
only existing client of these bits in the tree.
This patch adds skb_set_redirected() that sets on the redirected bit
on the skbuff, it specifies if the packet was redirect from ingress
and resets the timestamp (timestamp reset was originally missing in the
netfilter bugfix).
Fixes: bcfabee1af ("netfilter: nft_fwd_netdev: allow to redirect to ifb via ingress")
Reported-by: noreply@ellerman.id.au
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
260 lines
6.3 KiB
C
260 lines
6.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (c) 2015 Pablo Neira Ayuso <pablo@netfilter.org>
|
|
*/
|
|
|
|
#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 <linux/ip.h>
|
|
#include <linux/ipv6.h>
|
|
#include <net/netfilter/nf_tables.h>
|
|
#include <net/netfilter/nf_tables_offload.h>
|
|
#include <net/netfilter/nf_dup_netdev.h>
|
|
#include <net/neighbour.h>
|
|
#include <net/ip.h>
|
|
|
|
struct nft_fwd_netdev {
|
|
enum nft_registers sreg_dev:8;
|
|
};
|
|
|
|
static void nft_fwd_netdev_eval(const struct nft_expr *expr,
|
|
struct nft_regs *regs,
|
|
const struct nft_pktinfo *pkt)
|
|
{
|
|
struct nft_fwd_netdev *priv = nft_expr_priv(expr);
|
|
int oif = regs->data[priv->sreg_dev];
|
|
|
|
/* This is used by ifb only. */
|
|
skb_set_redirected(pkt->skb, true);
|
|
|
|
nf_fwd_netdev_egress(pkt, oif);
|
|
regs->verdict.code = NF_STOLEN;
|
|
}
|
|
|
|
static const struct nla_policy nft_fwd_netdev_policy[NFTA_FWD_MAX + 1] = {
|
|
[NFTA_FWD_SREG_DEV] = { .type = NLA_U32 },
|
|
[NFTA_FWD_SREG_ADDR] = { .type = NLA_U32 },
|
|
[NFTA_FWD_NFPROTO] = { .type = NLA_U32 },
|
|
};
|
|
|
|
static int nft_fwd_netdev_init(const struct nft_ctx *ctx,
|
|
const struct nft_expr *expr,
|
|
const struct nlattr * const tb[])
|
|
{
|
|
struct nft_fwd_netdev *priv = nft_expr_priv(expr);
|
|
|
|
if (tb[NFTA_FWD_SREG_DEV] == NULL)
|
|
return -EINVAL;
|
|
|
|
priv->sreg_dev = nft_parse_register(tb[NFTA_FWD_SREG_DEV]);
|
|
return nft_validate_register_load(priv->sreg_dev, sizeof(int));
|
|
}
|
|
|
|
static int nft_fwd_netdev_dump(struct sk_buff *skb, const struct nft_expr *expr)
|
|
{
|
|
struct nft_fwd_netdev *priv = nft_expr_priv(expr);
|
|
|
|
if (nft_dump_register(skb, NFTA_FWD_SREG_DEV, priv->sreg_dev))
|
|
goto nla_put_failure;
|
|
|
|
return 0;
|
|
|
|
nla_put_failure:
|
|
return -1;
|
|
}
|
|
|
|
static int nft_fwd_netdev_offload(struct nft_offload_ctx *ctx,
|
|
struct nft_flow_rule *flow,
|
|
const struct nft_expr *expr)
|
|
{
|
|
const struct nft_fwd_netdev *priv = nft_expr_priv(expr);
|
|
int oif = ctx->regs[priv->sreg_dev].data.data[0];
|
|
|
|
return nft_fwd_dup_netdev_offload(ctx, flow, FLOW_ACTION_REDIRECT, oif);
|
|
}
|
|
|
|
struct nft_fwd_neigh {
|
|
enum nft_registers sreg_dev:8;
|
|
enum nft_registers sreg_addr:8;
|
|
u8 nfproto;
|
|
};
|
|
|
|
static void nft_fwd_neigh_eval(const struct nft_expr *expr,
|
|
struct nft_regs *regs,
|
|
const struct nft_pktinfo *pkt)
|
|
{
|
|
struct nft_fwd_neigh *priv = nft_expr_priv(expr);
|
|
void *addr = ®s->data[priv->sreg_addr];
|
|
int oif = regs->data[priv->sreg_dev];
|
|
unsigned int verdict = NF_STOLEN;
|
|
struct sk_buff *skb = pkt->skb;
|
|
struct net_device *dev;
|
|
int neigh_table;
|
|
|
|
switch (priv->nfproto) {
|
|
case NFPROTO_IPV4: {
|
|
struct iphdr *iph;
|
|
|
|
if (skb->protocol != htons(ETH_P_IP)) {
|
|
verdict = NFT_BREAK;
|
|
goto out;
|
|
}
|
|
if (skb_try_make_writable(skb, sizeof(*iph))) {
|
|
verdict = NF_DROP;
|
|
goto out;
|
|
}
|
|
iph = ip_hdr(skb);
|
|
ip_decrease_ttl(iph);
|
|
neigh_table = NEIGH_ARP_TABLE;
|
|
break;
|
|
}
|
|
case NFPROTO_IPV6: {
|
|
struct ipv6hdr *ip6h;
|
|
|
|
if (skb->protocol != htons(ETH_P_IPV6)) {
|
|
verdict = NFT_BREAK;
|
|
goto out;
|
|
}
|
|
if (skb_try_make_writable(skb, sizeof(*ip6h))) {
|
|
verdict = NF_DROP;
|
|
goto out;
|
|
}
|
|
ip6h = ipv6_hdr(skb);
|
|
ip6h->hop_limit--;
|
|
neigh_table = NEIGH_ND_TABLE;
|
|
break;
|
|
}
|
|
default:
|
|
verdict = NFT_BREAK;
|
|
goto out;
|
|
}
|
|
|
|
dev = dev_get_by_index_rcu(nft_net(pkt), oif);
|
|
if (dev == NULL)
|
|
return;
|
|
|
|
skb->dev = dev;
|
|
neigh_xmit(neigh_table, dev, addr, skb);
|
|
out:
|
|
regs->verdict.code = verdict;
|
|
}
|
|
|
|
static int nft_fwd_neigh_init(const struct nft_ctx *ctx,
|
|
const struct nft_expr *expr,
|
|
const struct nlattr * const tb[])
|
|
{
|
|
struct nft_fwd_neigh *priv = nft_expr_priv(expr);
|
|
unsigned int addr_len;
|
|
int err;
|
|
|
|
if (!tb[NFTA_FWD_SREG_DEV] ||
|
|
!tb[NFTA_FWD_SREG_ADDR] ||
|
|
!tb[NFTA_FWD_NFPROTO])
|
|
return -EINVAL;
|
|
|
|
priv->sreg_dev = nft_parse_register(tb[NFTA_FWD_SREG_DEV]);
|
|
priv->sreg_addr = nft_parse_register(tb[NFTA_FWD_SREG_ADDR]);
|
|
priv->nfproto = ntohl(nla_get_be32(tb[NFTA_FWD_NFPROTO]));
|
|
|
|
switch (priv->nfproto) {
|
|
case NFPROTO_IPV4:
|
|
addr_len = sizeof(struct in_addr);
|
|
break;
|
|
case NFPROTO_IPV6:
|
|
addr_len = sizeof(struct in6_addr);
|
|
break;
|
|
default:
|
|
return -EOPNOTSUPP;
|
|
}
|
|
|
|
err = nft_validate_register_load(priv->sreg_dev, sizeof(int));
|
|
if (err < 0)
|
|
return err;
|
|
|
|
return nft_validate_register_load(priv->sreg_addr, addr_len);
|
|
}
|
|
|
|
static int nft_fwd_neigh_dump(struct sk_buff *skb, const struct nft_expr *expr)
|
|
{
|
|
struct nft_fwd_neigh *priv = nft_expr_priv(expr);
|
|
|
|
if (nft_dump_register(skb, NFTA_FWD_SREG_DEV, priv->sreg_dev) ||
|
|
nft_dump_register(skb, NFTA_FWD_SREG_ADDR, priv->sreg_addr) ||
|
|
nla_put_be32(skb, NFTA_FWD_NFPROTO, htonl(priv->nfproto)))
|
|
goto nla_put_failure;
|
|
|
|
return 0;
|
|
|
|
nla_put_failure:
|
|
return -1;
|
|
}
|
|
|
|
static int nft_fwd_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_NETDEV_INGRESS));
|
|
}
|
|
|
|
static struct nft_expr_type nft_fwd_netdev_type;
|
|
static const struct nft_expr_ops nft_fwd_neigh_netdev_ops = {
|
|
.type = &nft_fwd_netdev_type,
|
|
.size = NFT_EXPR_SIZE(sizeof(struct nft_fwd_neigh)),
|
|
.eval = nft_fwd_neigh_eval,
|
|
.init = nft_fwd_neigh_init,
|
|
.dump = nft_fwd_neigh_dump,
|
|
.validate = nft_fwd_validate,
|
|
};
|
|
|
|
static const struct nft_expr_ops nft_fwd_netdev_ops = {
|
|
.type = &nft_fwd_netdev_type,
|
|
.size = NFT_EXPR_SIZE(sizeof(struct nft_fwd_netdev)),
|
|
.eval = nft_fwd_netdev_eval,
|
|
.init = nft_fwd_netdev_init,
|
|
.dump = nft_fwd_netdev_dump,
|
|
.validate = nft_fwd_validate,
|
|
.offload = nft_fwd_netdev_offload,
|
|
};
|
|
|
|
static const struct nft_expr_ops *
|
|
nft_fwd_select_ops(const struct nft_ctx *ctx,
|
|
const struct nlattr * const tb[])
|
|
{
|
|
if (tb[NFTA_FWD_SREG_ADDR])
|
|
return &nft_fwd_neigh_netdev_ops;
|
|
if (tb[NFTA_FWD_SREG_DEV])
|
|
return &nft_fwd_netdev_ops;
|
|
|
|
return ERR_PTR(-EOPNOTSUPP);
|
|
}
|
|
|
|
static struct nft_expr_type nft_fwd_netdev_type __read_mostly = {
|
|
.family = NFPROTO_NETDEV,
|
|
.name = "fwd",
|
|
.select_ops = nft_fwd_select_ops,
|
|
.policy = nft_fwd_netdev_policy,
|
|
.maxattr = NFTA_FWD_MAX,
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
static int __init nft_fwd_netdev_module_init(void)
|
|
{
|
|
return nft_register_expr(&nft_fwd_netdev_type);
|
|
}
|
|
|
|
static void __exit nft_fwd_netdev_module_exit(void)
|
|
{
|
|
nft_unregister_expr(&nft_fwd_netdev_type);
|
|
}
|
|
|
|
module_init(nft_fwd_netdev_module_init);
|
|
module_exit(nft_fwd_netdev_module_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Pablo Neira Ayuso <pablo@netfilter.org>");
|
|
MODULE_ALIAS_NFT_AF_EXPR(5, "fwd");
|