126 lines
3.8 KiB
Diff
126 lines
3.8 KiB
Diff
--- a/net/netfilter/xt_FLOWOFFLOAD.c
|
|
+++ b/net/netfilter/xt_FLOWOFFLOAD.c
|
|
@@ -222,13 +222,31 @@ xt_flowoffload_skip(struct sk_buff *skb,
|
|
return false;
|
|
}
|
|
|
|
-static bool flow_is_valid_ether_device(const struct net_device *dev)
|
|
+
|
|
+static void
|
|
+xt_flowoffload_get_dest_macaddr(u8 *dest, const struct dst_entry *dst,
|
|
+ const void *daddr)
|
|
{
|
|
- if (!dev || (dev->flags & IFF_LOOPBACK) || dev->type != ARPHRD_ETHER ||
|
|
- dev->addr_len != ETH_ALEN || !is_valid_ether_addr(dev->dev_addr))
|
|
- return false;
|
|
+ struct net_device *dev = dst->dev;
|
|
+ struct neighbour *n;
|
|
+ u8 nud_state;
|
|
+
|
|
+ memset(dest, 0, ETH_ALEN);
|
|
+
|
|
+ if (dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN ||
|
|
+ !is_valid_ether_addr(dev->dev_addr))
|
|
+ return;
|
|
+
|
|
+ n = dst_neigh_lookup(dst, daddr);
|
|
+ if (!n)
|
|
+ return;
|
|
|
|
- return true;
|
|
+ read_lock_bh(&n->lock);
|
|
+ nud_state = n->nud_state;
|
|
+ if (nud_state & NUD_VALID)
|
|
+ memcpy(dest, n->ha, ETH_ALEN);
|
|
+ read_unlock_bh(&n->lock);
|
|
+ neigh_release(n);
|
|
}
|
|
|
|
static void
|
|
@@ -242,9 +260,7 @@ xt_flowoffload_route_check_path(struct n
|
|
struct net_device_path_stack stack;
|
|
enum net_device_path_type prev_type;
|
|
struct net_device *dev = dst->dev;
|
|
- struct neighbour *n;
|
|
bool last = false;
|
|
- u8 nud_state;
|
|
int i;
|
|
|
|
route->tuple[!dir].in.ifindex = dev->ifindex;
|
|
@@ -253,24 +269,10 @@ xt_flowoffload_route_check_path(struct n
|
|
if (route->tuple[dir].xmit_type == FLOW_OFFLOAD_XMIT_XFRM)
|
|
return;
|
|
|
|
- if ((dev->flags & IFF_LOOPBACK) ||
|
|
- dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN ||
|
|
- !is_valid_ether_addr(dev->dev_addr))
|
|
- return;
|
|
-
|
|
- n = dst_neigh_lookup(dst, daddr);
|
|
- if (!n)
|
|
- return;
|
|
-
|
|
- read_lock_bh(&n->lock);
|
|
- nud_state = n->nud_state;
|
|
- memcpy(route->tuple[dir].out.h_dest, n->ha, ETH_ALEN);
|
|
- read_unlock_bh(&n->lock);
|
|
- neigh_release(n);
|
|
-
|
|
- if (!(nud_state & NUD_VALID))
|
|
+ if (dev->flags & IFF_LOOPBACK)
|
|
return;
|
|
|
|
+ xt_flowoffload_get_dest_macaddr(route->tuple[dir].out.h_dest, dst, daddr);
|
|
if (dev_fill_forward_path(dev, route->tuple[dir].out.h_dest, &stack) ||
|
|
!stack.num_paths)
|
|
return;
|
|
@@ -281,14 +283,12 @@ xt_flowoffload_route_check_path(struct n
|
|
int n_encaps = route->tuple[!dir].in.num_encaps;
|
|
|
|
dev = (struct net_device *)path->dev;
|
|
- if (flow_is_valid_ether_device(dev)) {
|
|
if (route->tuple[dir].xmit_type != FLOW_OFFLOAD_XMIT_DIRECT) {
|
|
memcpy(route->tuple[dir].out.h_source,
|
|
dev->dev_addr, ETH_ALEN);
|
|
route->tuple[dir].out.ifindex = dev->ifindex;
|
|
}
|
|
route->tuple[dir].xmit_type = FLOW_OFFLOAD_XMIT_DIRECT;
|
|
- }
|
|
|
|
switch (path->type) {
|
|
case DEV_PATH_PPPOE:
|
|
@@ -302,9 +302,10 @@ xt_flowoffload_route_check_path(struct n
|
|
route->tuple[!dir].in.num_encaps++;
|
|
route->tuple[!dir].in.encap[n_encaps].id = path->encap.id;
|
|
route->tuple[!dir].in.encap[n_encaps].proto = path->encap.proto;
|
|
- if (path->type == DEV_PATH_PPPOE)
|
|
- memcpy(route->tuple[dir].out.h_dest,
|
|
- path->encap.h_dest, ETH_ALEN);
|
|
+ if (path->type == DEV_PATH_PPPOE){
|
|
+ memcpy(route->tuple[dir].out.h_source,path->encap.h_source, ETH_ALEN);
|
|
+ memcpy(route->tuple[dir].out.h_dest,path->encap.h_dest, ETH_ALEN);
|
|
+ }
|
|
break;
|
|
case DEV_PATH_BRIDGE:
|
|
switch (path->bridge.vlan_mode) {
|
|
--- a/drivers/net/ppp/pppoe.c
|
|
+++ b/drivers/net/ppp/pppoe.c
|
|
@@ -987,6 +987,7 @@ static int pppoe_fill_forward_path(struc
|
|
path->type = DEV_PATH_PPPOE;
|
|
path->encap.proto = htons(ETH_P_PPP_SES);
|
|
path->encap.id = be16_to_cpu(po->num);
|
|
+ memcpy(path->encap.h_source, po->pppoe_dev->dev_addr, ETH_ALEN);
|
|
memcpy(path->encap.h_dest, po->pppoe_pa.remote, ETH_ALEN);
|
|
path->dev = ctx->dev;
|
|
ctx->dev = dev;
|
|
--- a/include/linux/netdevice.h
|
|
+++ b/include/linux/netdevice.h
|
|
@@ -842,6 +842,7 @@ struct net_device_path {
|
|
struct {
|
|
u16 id;
|
|
__be16 proto;
|
|
+ u8 h_source[ETH_ALEN];
|
|
u8 h_dest[ETH_ALEN];
|
|
} encap;
|
|
struct {
|