diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
| commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
| tree | 962e068491b752a944f61c454fad3f8619a1ea3f /security/selinux/ss/sidtab.c | |
| parent | [CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash (diff) | |
| parent | slab_err: Pass parameters correctly to slab_bug (diff) | |
| download | linux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.xz linux-36d99df2fb474222ab47fbe8ae7385661033223b.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'security/selinux/ss/sidtab.c')
| -rw-r--r-- | security/selinux/ss/sidtab.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/selinux/ss/sidtab.c b/security/selinux/ss/sidtab.c index 53a54a77f1f8..4a516ff4bcde 100644 --- a/security/selinux/ss/sidtab.c +++ b/security/selinux/ss/sidtab.c @@ -156,12 +156,10 @@ void sidtab_map_remove_on_error(struct sidtab *s, while (cur != NULL) { ret = apply(cur->sid, &cur->context, args); if (ret) { - if (last) { + if (last) last->next = cur->next; - } else { + else s->htable[i] = cur->next; - } - temp = cur; cur = cur->next; context_destroy(&temp->context); |