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

[XFRM]: fix softirq-unsafe xfrm typemap->lock use 



xfrm typemap->lock may be used in softirq context, so all write_lock()
uses must be softirq-safe.

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

net/xfrm/xfrm_policy.c

+4 −4
Original line number Diff line number Diff line
@@ -57,12 +57,12 @@ int xfrm_register_type(struct xfrm_type *type, unsigned short family) 
		return -EAFNOSUPPORT;

	typemap = afinfo->type_map;



	write_lock(&typemap->lock);

	write_lock_bh(&typemap->lock);

	if (likely(typemap->map[type->proto] == NULL))

		typemap->map[type->proto] = type;

	else

		err = -EEXIST;

	write_unlock(&typemap->lock);

	write_unlock_bh(&typemap->lock);

	xfrm_policy_put_afinfo(afinfo);

	return err;

}
@@ -78,12 +78,12 @@ int xfrm_unregister_type(struct xfrm_type *type, unsigned short family) 
		return -EAFNOSUPPORT;

	typemap = afinfo->type_map;



	write_lock(&typemap->lock);

	write_lock_bh(&typemap->lock);

	if (unlikely(typemap->map[type->proto] != type))

		err = -ENOENT;

	else

		typemap->map[type->proto] = NULL;

	write_unlock(&typemap->lock);

	write_unlock_bh(&typemap->lock);

	xfrm_policy_put_afinfo(afinfo);

	return err;

}