diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:43:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:43:42 -0800 |
| commit | b07e3c3a1db0ce399d2a1d04860e1b901927c05e (patch) | |
| tree | 474c17e969b5462a3702f0021249e1d78522ac35 /security/selinux/ss/hashtab.c | |
| parent | 5f56bbdf1e35d41b4b3d4c92bdb3e70c63877e4d (diff) | |
| parent | b94c7e677b9d28bd3f9ba4a70df6bfa7942867ca (diff) | |
Merge branch 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux: validate kernel object classes and permissions
SELinux: ensure keys constant in hashtab_search
SELinux: export object class and permission definitions
SELinux: remove current object class and permission validation mechanism
Diffstat (limited to 'security/selinux/ss/hashtab.c')
| -rw-r--r-- | security/selinux/ss/hashtab.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c index 24e5ec95763..77b530c3bbc 100644 --- a/security/selinux/ss/hashtab.c +++ b/security/selinux/ss/hashtab.c @@ -8,8 +8,8 @@ #include <linux/errno.h> #include "hashtab.h" -struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key), - int (*keycmp)(struct hashtab *h, void *key1, void *key2), +struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void *key), + int (*keycmp)(struct hashtab *h, const void *key1, const void *key2), u32 size) { struct hashtab *p; @@ -71,7 +71,7 @@ int hashtab_insert(struct hashtab *h, void *key, void *datum) return 0; } -void *hashtab_search(struct hashtab *h, void *key) +void *hashtab_search(struct hashtab *h, const void *key) { u32 hvalue; struct hashtab_node *cur; |