summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorhuaibin Wang <huaibin.wang@6wind.com>2015-02-11 18:10:36 +0100
committerSteffen Klassert <steffen.klassert@secunet.com>2015-02-12 07:10:56 +0100
commitac37e2515c1a89c477459a2020b6bfdedabdb91b (patch)
treea1d2ad2b28b5b4cd032dca88c6c297afb7155d24 /include/net
parent044a832a7779c0638bea2d0fea901c055b995f4a (diff)
downloadlinux-ac37e2515c1a89c477459a2020b6bfdedabdb91b.tar.gz
linux-ac37e2515c1a89c477459a2020b6bfdedabdb91b.tar.bz2
linux-ac37e2515c1a89c477459a2020b6bfdedabdb91b.zip
xfrm: release dst_orig in case of error in xfrm_lookup()
dst_orig should be released on error. Function like __xfrm_route_forward() expects that behavior. Since a recent commit, xfrm_lookup() may also be called by xfrm_lookup_route(), which expects the opposite. Let's introduce a new flag (XFRM_LOOKUP_KEEP_DST_REF) to tell what should be done in case of error. Fixes: f92ee61982d("xfrm: Generate blackhole routes only from route lookup functions") Signed-off-by: huaibin Wang <huaibin.wang@6wind.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/dst.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index a8ae4e760778..0fb99a26e973 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -481,6 +481,7 @@ void dst_init(void);
enum {
XFRM_LOOKUP_ICMP = 1 << 0,
XFRM_LOOKUP_QUEUE = 1 << 1,
+ XFRM_LOOKUP_KEEP_DST_REF = 1 << 2,
};
struct flowi;