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

Commit f5e2bb4f authored by Florian Westphal's avatar Florian Westphal Committed by Steffen Klassert
Browse files

xfrm: policy: xfrm_get_tos cannot fail 



The comment makes it look like get_tos() is used to validate something,
but it turns out the comment was about xfrm_find_bundle() which got removed
years ago.

xfrm_get_tos will return either the tos (ipv4) or 0 (ipv6).

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 960fdfde

net/xfrm/xfrm_policy.c

+5 −14
Original line number Diff line number Diff line
@@ -1538,19 +1538,13 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, const struct flowi *fl, 


}



/* Check that the bundle accepts the flow and its components are

 * still valid.

 */



static inline int xfrm_get_tos(const struct flowi *fl, int family)

static int xfrm_get_tos(const struct flowi *fl, int family)

{

	struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);

	int tos;



	if (!afinfo)

		return -EINVAL;

	struct xfrm_policy_afinfo *afinfo;

	int tos = 0;



	tos = afinfo->get_tos(fl);

	afinfo = xfrm_policy_get_afinfo(family);

	tos = afinfo ? afinfo->get_tos(fl) : 0;



	xfrm_policy_put_afinfo(afinfo);
@@ -1705,9 +1699,6 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, 
	xfrm_flowi_addr_get(fl, &saddr, &daddr, family);



	tos = xfrm_get_tos(fl, family);

	err = tos;

	if (tos < 0)

		goto put_states;



	dst_hold(dst);