diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2007-11-07 16:08:00 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2007-11-07 22:56:23 +0100 |
| commit | 45e5421eb5bbcd9efa037d682dd357284e3ef982 (patch) | |
| tree | ceb24143024fe335d08ac30fb4da9ca25fbeb6e6 /security/selinux/ss/avtab.h | |
| parent | SELinux: fix bug in new ebitmap code. (diff) | |
| download | linux-45e5421eb5bbcd9efa037d682dd357284e3ef982.tar.xz linux-45e5421eb5bbcd9efa037d682dd357284e3ef982.zip | |
SELinux: add more validity checks on policy load
Add more validity checks at policy load time to reject malformed
policies and prevent subsequent out-of-range indexing when in permissive
mode. Resolves the NULL pointer dereference reported in
https://bugzilla.redhat.com/show_bug.cgi?id=357541.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/ss/avtab.h')
| -rw-r--r-- | security/selinux/ss/avtab.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/selinux/ss/avtab.h b/security/selinux/ss/avtab.h index d8edf8ca56d1..8da6a8428086 100644 --- a/security/selinux/ss/avtab.h +++ b/security/selinux/ss/avtab.h @@ -64,12 +64,13 @@ struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *k); void avtab_destroy(struct avtab *h); void avtab_hash_eval(struct avtab *h, char *tag); -int avtab_read_item(void *fp, uint32_t vers, struct avtab *a, +struct policydb; +int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol, int (*insert)(struct avtab *a, struct avtab_key *k, struct avtab_datum *d, void *p), void *p); -int avtab_read(struct avtab *a, void *fp, u32 vers); +int avtab_read(struct avtab *a, void *fp, struct policydb *pol); struct avtab_node *avtab_insert_nonunique(struct avtab *h, struct avtab_key *key, struct avtab_datum *datum); |