Skip to content

Commit

Permalink
netfilter: add and use nf_fwd_netdev_egress
Browse files Browse the repository at this point in the history
... so we can use current skb instead of working with a clone.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Florian Westphal authored and Pablo Neira Ayuso committed Dec 6, 2016
1 parent df122f5 commit 3bf3276
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 10 deletions.
1 change: 1 addition & 0 deletions include/net/netfilter/nf_dup_netdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
#define _NF_DUP_NETDEV_H_

void nf_dup_netdev_egress(const struct nft_pktinfo *pkt, int oif);
void nf_fwd_netdev_egress(const struct nft_pktinfo *pkt, int oif);

#endif
33 changes: 25 additions & 8 deletions net/netfilter/nf_dup_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,29 @@
#include <linux/netfilter/nf_tables.h>
#include <net/netfilter/nf_tables.h>

static void nf_do_netdev_egress(struct sk_buff *skb, struct net_device *dev)
{
if (skb_mac_header_was_set(skb))
skb_push(skb, skb->mac_len);

skb->dev = dev;
dev_queue_xmit(skb);
}

void nf_fwd_netdev_egress(const struct nft_pktinfo *pkt, int oif)
{
struct net_device *dev;

dev = dev_get_by_index_rcu(nft_net(pkt), oif);
if (!dev) {
kfree_skb(pkt->skb);
return;
}

nf_do_netdev_egress(pkt->skb, dev);
}
EXPORT_SYMBOL_GPL(nf_fwd_netdev_egress);

void nf_dup_netdev_egress(const struct nft_pktinfo *pkt, int oif)
{
struct net_device *dev;
Expand All @@ -24,14 +47,8 @@ void nf_dup_netdev_egress(const struct nft_pktinfo *pkt, int oif)
return;

skb = skb_clone(pkt->skb, GFP_ATOMIC);
if (skb == NULL)
return;

if (skb_mac_header_was_set(skb))
skb_push(skb, skb->mac_len);

skb->dev = dev;
dev_queue_xmit(skb);
if (skb)
nf_do_netdev_egress(skb, dev);
}
EXPORT_SYMBOL_GPL(nf_dup_netdev_egress);

Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/nft_fwd_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ static void nft_fwd_netdev_eval(const struct nft_expr *expr,
struct nft_fwd_netdev *priv = nft_expr_priv(expr);
int oif = regs->data[priv->sreg_dev];

nf_dup_netdev_egress(pkt, oif);
regs->verdict.code = NF_DROP;
nf_fwd_netdev_egress(pkt, oif);
regs->verdict.code = NF_STOLEN;
}

static const struct nla_policy nft_fwd_netdev_policy[NFTA_FWD_MAX + 1] = {
Expand Down

0 comments on commit 3bf3276

Please sign in to comment.