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

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

xfrm: policy: xfrm_policy_unregister_afinfo can return void 



Nothing checks the return value. Also, the errors returned on unregister
are impossible (we only support INET and INET6, so no way
xfrm_policy_afinfo[afinfo->family] can be anything other than 'afinfo'
itself).

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

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ struct xfrm_policy_afinfo { 
};



int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);

int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);

void xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);

void km_policy_notify(struct xfrm_policy *xp, int dir,

		      const struct km_event *c);

void km_state_notify(struct xfrm_state *x, const struct km_event *c);

net/xfrm/xfrm_policy.c

+13 −22
Original line number Diff line number Diff line
@@ -2883,24 +2883,17 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) 
}

EXPORT_SYMBOL(xfrm_policy_register_afinfo);



int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)

void xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)

{

	int err = 0;

	if (unlikely(afinfo == NULL))

		return -EINVAL;

	struct dst_ops *dst_ops = afinfo->dst_ops;



	if (unlikely(afinfo->family >= NPROTO))

		return -EAFNOSUPPORT;

	spin_lock(&xfrm_policy_afinfo_lock);

	if (likely(xfrm_policy_afinfo[afinfo->family] != NULL)) {

		if (unlikely(xfrm_policy_afinfo[afinfo->family] != afinfo))

			err = -EINVAL;

		else

		return;



	if (likely(xfrm_policy_afinfo[afinfo->family] != afinfo)) {

		RCU_INIT_POINTER(xfrm_policy_afinfo[afinfo->family],

					 NULL);

	}

	spin_unlock(&xfrm_policy_afinfo_lock);

	if (!err) {

		struct dst_ops *dst_ops = afinfo->dst_ops;



	synchronize_rcu();
@@ -2910,8 +2903,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo) 
	dst_ops->link_failure = NULL;

	afinfo->garbage_collect = NULL;

}

	return err;

}

EXPORT_SYMBOL(xfrm_policy_unregister_afinfo);



static int xfrm_dev_event(struct notifier_block *this, unsigned long event, void *ptr)