aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-11-14 00:35:32 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:53:40 -0500
commit45ff5a3f9a3d0b1b4f063b5285ab39b7fac59471 (patch)
tree4b7ed3d419b20e935f356f2020bd485e6f1e6ab5 /net/ipv6
parent8ce68ceb55fb62d2c8e9a3e94c4ef6ff3e3064ce (diff)
[IPSEC]: Set dst->input to dst_discard
The input function should never be invoked on IPsec dst objects. This is because we don't apply IPsec on input until after we've made the routing decision. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/xfrm6_policy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index bc508d0a87d5..89432279d3a0 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -14,6 +14,7 @@
14#include <linux/compiler.h> 14#include <linux/compiler.h>
15#include <linux/netdevice.h> 15#include <linux/netdevice.h>
16#include <net/addrconf.h> 16#include <net/addrconf.h>
17#include <net/dst.h>
17#include <net/xfrm.h> 18#include <net/xfrm.h>
18#include <net/ip.h> 19#include <net/ip.h>
19#include <net/ipv6.h> 20#include <net/ipv6.h>
@@ -214,7 +215,7 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
214 dst_prev->trailer_len = trailer_len; 215 dst_prev->trailer_len = trailer_len;
215 memcpy(&dst_prev->metrics, &x->route->metrics, sizeof(dst_prev->metrics)); 216 memcpy(&dst_prev->metrics, &x->route->metrics, sizeof(dst_prev->metrics));
216 217
217 dst_prev->input = rt->u.dst.input; 218 dst_prev->input = dst_discard;
218 dst_prev->output = dst_prev->xfrm->outer_mode->afinfo->output; 219 dst_prev->output = dst_prev->xfrm->outer_mode->afinfo->output;
219 /* Sheit... I remember I did this right. Apparently, 220 /* Sheit... I remember I did this right. Apparently,
220 * it was magically lost, so this code needs audit */ 221 * it was magically lost, so this code needs audit */