diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-08 22:12:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-08 22:12:37 +0200 |
| commit | 40e3012e6ea715e957347477a980145210735267 (patch) | |
| tree | 492d68025341754ae2408917eb4466dd1c25a1b7 /net/ipv4 | |
| parent | MAINTAINERS: Update CPMAC email address (diff) | |
| parent | xfrm: Only add l3mdev oif to dst lookups (diff) | |
| download | linux-40e3012e6ea715e957347477a980145210735267.tar.xz linux-40e3012e6ea715e957347477a980145210735267.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
ipsec 2016-09-08
1) Fix a crash when xfrm_dump_sa returns an error.
From Vegard Nossum.
2) Remove some incorrect WARN() on normal error handling.
From Vegard Nossum.
3) Ignore socket policies when rebuilding hash tables,
socket policies are not inserted into the hash tables.
From Tobias Brunner.
4) Initialize and check tunnel pointers properly before
we use it. From Alexey Kodanev.
5) Fix l3mdev oif setting on xfrm dst lookups.
From David Ahern.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/xfrm4_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index b644a23c3db0..41f5b504a782 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -29,7 +29,7 @@ static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4, memset(fl4, 0, sizeof(*fl4)); fl4->daddr = daddr->a4; fl4->flowi4_tos = tos; - fl4->flowi4_oif = oif; + fl4->flowi4_oif = l3mdev_master_ifindex_by_index(net, oif); if (saddr) fl4->saddr = saddr->a4; |