diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2010-04-22 01:25:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-22 01:25:30 +0200 |
| commit | bc8e4b954e463716a57d8113dd50ae9d47b682a7 (patch) | |
| tree | 41a2b898ae8d269da8b1d8e649e5711356d49ee3 /net | |
| parent | can: Fix possible NULL pointer dereference in ems_usb.c (diff) | |
| download | linux-bc8e4b954e463716a57d8113dd50ae9d47b682a7.tar.xz linux-bc8e4b954e463716a57d8113dd50ae9d47b682a7.zip | |
xfrm6: ensure to use the same dev when building a bundle
When building a bundle, we set dst.dev and rt6.rt6i_idev.
We must ensure to set the same device for both fields.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index ae181651c75a..00bf7c962b7e 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -124,7 +124,7 @@ static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, xdst->u.dst.dev = dev; dev_hold(dev); - xdst->u.rt6.rt6i_idev = in6_dev_get(rt->u.dst.dev); + xdst->u.rt6.rt6i_idev = in6_dev_get(dev); if (!xdst->u.rt6.rt6i_idev) return -ENODEV; |