openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

SELinux: open code sidtab lock 

Open code sidtab lock to make Andrew Morton happy.

Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
This commit is contained in:
James Morris 2008-06-06 18:50:12 +10:00
parent 972ccac2b2
commit bdd581c143
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
security/selinux/ss/sidtab.c
View File

@ -14,10 +14,6 @@
#define SIDTAB_HASH(sid) \ #define SIDTAB_HASH(sid) \
(sid & SIDTAB_HASH_MASK) (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 sidtab_init(struct sidtab *s)
{ {
int i; int i;
@ -30,7 +26,7 @@ int sidtab_init(struct sidtab *s)
s->nel = 0; s->nel = 0;
s->next_sid = 1; s->next_sid = 1;
s->shutdown = 0; s->shutdown = 0;
INIT_SIDTAB_LOCK(s); spin_lock_init(&s->lock);
return 0; return 0;
} }
@ -180,7 +176,7 @@ int sidtab_context_to_sid(struct sidtab *s,
sid = sidtab_search_context(s, context); sid = sidtab_search_context(s, context);
if (!sid) { if (!sid) {
SIDTAB_LOCK(s, flags); spin_lock_irqsave(&s->lock, flags);
/* Rescan now that we hold the lock. */ /* Rescan now that we hold the lock. */
sid = sidtab_search_context(s, context); sid = sidtab_search_context(s, context);
if (sid) if (sid)
@ -199,7 +195,7 @@ int sidtab_context_to_sid(struct sidtab *s,
if (ret) if (ret)
s->next_sid--; s->next_sid--;
unlock_out: unlock_out:
SIDTAB_UNLOCK(s, flags); spin_unlock_irqrestore(&s->lock, flags);
} }
if (ret) if (ret)
@ -264,19 +260,19 @@ void sidtab_set(struct sidtab *dst, struct sidtab *src)
{ {
unsigned long flags; unsigned long flags;
SIDTAB_LOCK(src, flags); spin_lock_irqsave(&src->lock, flags);
dst->htable = src->htable; dst->htable = src->htable;
dst->nel = src->nel; dst->nel = src->nel;
dst->next_sid = src->next_sid; dst->next_sid = src->next_sid;
dst->shutdown = 0; dst->shutdown = 0;
SIDTAB_UNLOCK(src, flags); spin_unlock_irqrestore(&src->lock, flags);
} }
void sidtab_shutdown(struct sidtab *s) void sidtab_shutdown(struct sidtab *s)
{ {
unsigned long flags; unsigned long flags;
SIDTAB_LOCK(s, flags); spin_lock_irqsave(&s->lock, flags);
s->shutdown = 1; s->shutdown = 1;
SIDTAB_UNLOCK(s, flags); spin_unlock_irqrestore(&s->lock, flags);
} }