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

Commit f3111502 authored by Ingo Molnar's avatar Ingo Molnar Committed by David S. Miller
Browse files

[XFRM]: fix incorrect xfrm_state_afinfo_lock use 



xfrm_state_afinfo_lock can be read-locked from bh context, so take it
in a bh-safe manner in xfrm_state_register_afinfo() and
xfrm_state_unregister_afinfo(). Found by the lock validator.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83de47cd

net/xfrm/xfrm_state.c

+4 −4
Original line number Diff line number Diff line
@@ -1061,7 +1061,7 @@ int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo) 
		return -EINVAL;

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

		return -EAFNOSUPPORT;

	write_lock(&xfrm_state_afinfo_lock);

	write_lock_bh(&xfrm_state_afinfo_lock);

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

		err = -ENOBUFS;

	else {
@@ -1069,7 +1069,7 @@ int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo) 
		afinfo->state_byspi = xfrm_state_byspi;

		xfrm_state_afinfo[afinfo->family] = afinfo;

	}

	write_unlock(&xfrm_state_afinfo_lock);

	write_unlock_bh(&xfrm_state_afinfo_lock);

	return err;

}

EXPORT_SYMBOL(xfrm_state_register_afinfo);
@@ -1081,7 +1081,7 @@ int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo) 
		return -EINVAL;

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

		return -EAFNOSUPPORT;

	write_lock(&xfrm_state_afinfo_lock);

	write_lock_bh(&xfrm_state_afinfo_lock);

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

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

			err = -EINVAL;
@@ -1091,7 +1091,7 @@ int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo) 
			afinfo->state_bydst = NULL;

		}

	}

	write_unlock(&xfrm_state_afinfo_lock);

	write_unlock_bh(&xfrm_state_afinfo_lock);

	return err;

}

EXPORT_SYMBOL(xfrm_state_unregister_afinfo);