Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac37e251 authored by huaibin Wang's avatar huaibin Wang Committed by Steffen Klassert
Browse files

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: f92ee619("xfrm: Generate blackhole routes only from route lookup functions")
Signed-off-by: default avatarhuaibin Wang <huaibin.wang@6wind.com>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 044a832a

include/net/dst.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

net/xfrm/xfrm_policy.c

+6 −6
Original line number Diff line number Diff line
@@ -2269,11 +2269,9 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, 
		 * have the xfrm_state's. We need to wait for KM to

		 * negotiate new SA's or bail out with error.*/

		if (net->xfrm.sysctl_larval_drop) {

			dst_release(dst);

			xfrm_pols_put(pols, drop_pols);

			XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES);



			return ERR_PTR(-EREMOTE);

			err = -EREMOTE;

			goto error;

		}



		err = -EAGAIN;
@@ -2324,6 +2322,7 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, 
error:

	dst_release(dst);

dropdst:

	if (!(flags & XFRM_LOOKUP_KEEP_DST_REF))

		dst_release(dst_orig);

	xfrm_pols_put(pols, drop_pols);

	return ERR_PTR(err);
@@ -2338,7 +2337,8 @@ struct dst_entry *xfrm_lookup_route(struct net *net, struct dst_entry *dst_orig, 
				    struct sock *sk, int flags)

{

	struct dst_entry *dst = xfrm_lookup(net, dst_orig, fl, sk,

					    flags | XFRM_LOOKUP_QUEUE);

					    flags | XFRM_LOOKUP_QUEUE |

					    XFRM_LOOKUP_KEEP_DST_REF);



	if (IS_ERR(dst) && PTR_ERR(dst) == -EREMOTE)

		return make_blackhole(net, dst_orig->ops->family, dst_orig);