Message ID | 311F962F-9DAF-4B24-B7FD-F158895D304D@ipflavors.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Romain KUNTZ <r.kuntz@ipflavors.com> Date: Mon, 18 Feb 2013 13:36:24 +0100 > Neighbor is cloned in xfrm6_fill_dst but seems to never be released. > Neighbor entry should be released when XFRM6 dst entry is destroyed > in xfrm6_dst_destroy, otherwise references may be kept forever on > the device pointed by the neighbor entry. > > I may not have understood all the subtleties of XFRM & dst so I would > be happy to receive comments on this patch. > > Signed-off-by: Romain Kuntz <r.kuntz@ipflavors.com> This patch is definitely correct. Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index c984413..8f32718 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c @@ -236,6 +236,8 @@ static void xfrm6_dst_destroy(struct dst_entry *dst) { struct xfrm_dst *xdst = (struct xfrm_dst *)dst; + if (likely(xdst->u.rt6.n)) + neigh_release(xdst->u.rt6.n); if (likely(xdst->u.rt6.rt6i_idev)) in6_dev_put(xdst->u.rt6.rt6i_idev); dst_destroy_metrics_generic(dst);
Neighbor is cloned in xfrm6_fill_dst but seems to never be released. Neighbor entry should be released when XFRM6 dst entry is destroyed in xfrm6_dst_destroy, otherwise references may be kept forever on the device pointed by the neighbor entry. I may not have understood all the subtleties of XFRM & dst so I would be happy to receive comments on this patch. Signed-off-by: Romain Kuntz <r.kuntz@ipflavors.com> --- net/ipv6/xfrm6_policy.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)