diff options
| author | huaibin Wang <huaibin.wang@6wind.com> | 2015-02-11 12:10:36 -0500 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2015-02-12 01:10:56 -0500 |
| commit | ac37e2515c1a89c477459a2020b6bfdedabdb91b (patch) | |
| tree | a1d2ad2b28b5b4cd032dca88c6c297afb7155d24 /include/net | |
| parent | 044a832a7779c0638bea2d0fea901c055b995f4a (diff) | |
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.h | 1 |
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); | |||
| 481 | enum { | 481 | enum { |
| 482 | XFRM_LOOKUP_ICMP = 1 << 0, | 482 | XFRM_LOOKUP_ICMP = 1 << 0, |
| 483 | XFRM_LOOKUP_QUEUE = 1 << 1, | 483 | XFRM_LOOKUP_QUEUE = 1 << 1, |
| 484 | XFRM_LOOKUP_KEEP_DST_REF = 1 << 2, | ||
| 484 | }; | 485 | }; |
| 485 | 486 | ||
| 486 | struct flowi; | 487 | struct flowi; |
