aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/xfrm4_policy.c3
-rw-r--r--net/ipv6/xfrm6_policy.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 7d250a1bd2cf..c40a71b74dba 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -10,6 +10,7 @@
10 10
11#include <linux/compiler.h> 11#include <linux/compiler.h>
12#include <linux/inetdevice.h> 12#include <linux/inetdevice.h>
13#include <net/dst.h>
13#include <net/xfrm.h> 14#include <net/xfrm.h>
14#include <net/ip.h> 15#include <net/ip.h>
15 16
@@ -167,7 +168,7 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
167 dst_prev->trailer_len = trailer_len; 168 dst_prev->trailer_len = trailer_len;
168 memcpy(&dst_prev->metrics, &x->route->metrics, sizeof(dst_prev->metrics)); 169 memcpy(&dst_prev->metrics, &x->route->metrics, sizeof(dst_prev->metrics));
169 170
170 dst_prev->input = rt->u.dst.input; 171 dst_prev->input = dst_discard;
171 dst_prev->output = dst_prev->xfrm->outer_mode->afinfo->output; 172 dst_prev->output = dst_prev->xfrm->outer_mode->afinfo->output;
172 if (rt0->peer) 173 if (rt0->peer)
173 atomic_inc(&rt0->peer->refcnt); 174 atomic_inc(&rt0->peer->refcnt);
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 */