diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-18 04:00:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-18 04:00:43 +0100 |
| commit | 67f4efdce7d85282fbd5832cddc80a07eb89b6d6 (patch) | |
| tree | 9a1771ef13b27abdf8cf172e5b7556ab93e5c48c /net/ipv4/ip_vti.c | |
| parent | net: use right lock in __dev_remove_offload (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | linux-67f4efdce7d85282fbd5832cddc80a07eb89b6d6.tar.xz linux-67f4efdce7d85282fbd5832cddc80a07eb89b6d6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor line offset auto-merges.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_vti.c')
| -rw-r--r-- | net/ipv4/ip_vti.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 516188b0dc1e..f4a825d3bd7f 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -324,12 +324,17 @@ static int vti_rcv(struct sk_buff *skb) if (tunnel != NULL) { struct pcpu_tstats *tstats; + if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) + return -1; + tstats = this_cpu_ptr(tunnel->dev->tstats); u64_stats_update_begin(&tstats->syncp); tstats->rx_packets++; tstats->rx_bytes += skb->len; u64_stats_update_end(&tstats->syncp); + skb->mark = 0; + secpath_reset(skb); skb->dev = tunnel->dev; return 1; } |