diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-03-15 15:26:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 15:26:43 -0700 |
| commit | 7313714775a6411402f63261c05fbb4ee3d5b64a (patch) | |
| tree | ef2983b19f31ba0743911d69f82d0aa252f10913 /net | |
| parent | c337ffb68e1e71bad069b14d2246fa1e0c31699c (diff) | |
| download | op-kernel-dev-7313714775a6411402f63261c05fbb4ee3d5b64a.zip op-kernel-dev-7313714775a6411402f63261c05fbb4ee3d5b64a.tar.gz | |
xfrm: fix __xfrm_route_forward()
This function should return 0 in case of error, 1 if OK
commit 452edd598f60522 (xfrm: Return dst directly from xfrm_lookup())
got it wrong.
Reported-and-bisected-by: Michael Smith <msmith@cbnco.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 1ba0258..027e3c6 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -2175,7 +2175,7 @@ int __xfrm_route_forward(struct sk_buff *skb, unsigned short family) struct net *net = dev_net(skb->dev); struct flowi fl; struct dst_entry *dst; - int res = 0; + int res = 1; if (xfrm_decode_session(skb, &fl, family) < 0) { XFRM_INC_STATS(net, LINUX_MIB_XFRMFWDHDRERROR); @@ -2186,7 +2186,7 @@ int __xfrm_route_forward(struct sk_buff *skb, unsigned short family) dst = xfrm_lookup(net, skb_dst(skb), &fl, NULL, 0); if (IS_ERR(dst)) { - res = 1; + res = 0; dst = NULL; } skb_dst_set(skb, dst); |
