Commit bdd581c1 authored by James Morris's avatar James Morris
Browse files

SELinux: open code sidtab lock 



Open code sidtab lock to make Andrew Morton happy.

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
Acked-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
parent 972ccac2

security/selinux/ss/sidtab.c

+7 −11
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
#define SIDTAB_HASH(sid) \

(sid & SIDTAB_HASH_MASK)



#define INIT_SIDTAB_LOCK(s) spin_lock_init(&s->lock)

#define SIDTAB_LOCK(s, x) spin_lock_irqsave(&s->lock, x)

#define SIDTAB_UNLOCK(s, x) spin_unlock_irqrestore(&s->lock, x)



int sidtab_init(struct sidtab *s)

{

	int i;
@@ -30,7 +26,7 @@ int sidtab_init(struct sidtab *s) 
	s->nel = 0;

	s->next_sid = 1;

	s->shutdown = 0;

	INIT_SIDTAB_LOCK(s);

	spin_lock_init(&s->lock);

	return 0;

}
@@ -180,7 +176,7 @@ int sidtab_context_to_sid(struct sidtab *s, 


	sid = sidtab_search_context(s, context);

	if (!sid) {

		SIDTAB_LOCK(s, flags);

		spin_lock_irqsave(&s->lock, flags);

		/* Rescan now that we hold the lock. */

		sid = sidtab_search_context(s, context);

		if (sid)
@@ -199,7 +195,7 @@ int sidtab_context_to_sid(struct sidtab *s, 
		if (ret)

			s->next_sid--;

unlock_out:

		SIDTAB_UNLOCK(s, flags);

		spin_unlock_irqrestore(&s->lock, flags);

	}



	if (ret)
@@ -264,19 +260,19 @@ void sidtab_set(struct sidtab *dst, struct sidtab *src) 
{

	unsigned long flags;



	SIDTAB_LOCK(src, flags);

	spin_lock_irqsave(&src->lock, flags);

	dst->htable = src->htable;

	dst->nel = src->nel;

	dst->next_sid = src->next_sid;

	dst->shutdown = 0;

	SIDTAB_UNLOCK(src, flags);

	spin_unlock_irqrestore(&src->lock, flags);

}



void sidtab_shutdown(struct sidtab *s)

{

	unsigned long flags;



	SIDTAB_LOCK(s, flags);

	spin_lock_irqsave(&s->lock, flags);

	s->shutdown = 1;

	SIDTAB_UNLOCK(s, flags);

	spin_unlock_irqrestore(&s->lock, flags);

}