diff options
Diffstat (limited to 'security/selinux/ss')
-rw-r--r-- | security/selinux/ss/avtab.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c index 916e73a18bc5..a6175306d5b6 100644 --- a/security/selinux/ss/avtab.c +++ b/security/selinux/ss/avtab.c | |||
@@ -6,15 +6,15 @@ | |||
6 | 6 | ||
7 | /* Updated: Frank Mayer <mayerf@tresys.com> and Karl MacMillan <kmacmillan@tresys.com> | 7 | /* Updated: Frank Mayer <mayerf@tresys.com> and Karl MacMillan <kmacmillan@tresys.com> |
8 | * | 8 | * |
9 | * Added conditional policy language extensions | 9 | * Added conditional policy language extensions |
10 | * | 10 | * |
11 | * Copyright (C) 2003 Tresys Technology, LLC | 11 | * Copyright (C) 2003 Tresys Technology, LLC |
12 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
13 | * it under the terms of the GNU General Public License as published by | 13 | * it under the terms of the GNU General Public License as published by |
14 | * the Free Software Foundation, version 2. | 14 | * the Free Software Foundation, version 2. |
15 | * | 15 | * |
16 | * Updated: Yuichi Nakamura <ynakam@hitachisoft.jp> | 16 | * Updated: Yuichi Nakamura <ynakam@hitachisoft.jp> |
17 | * Tuned number of hash slots for avtab to reduce memory usage | 17 | * Tuned number of hash slots for avtab to reduce memory usage |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
@@ -33,10 +33,10 @@ static inline int avtab_hash(struct avtab_key *keyp, u16 mask) | |||
33 | 33 | ||
34 | static struct avtab_node* | 34 | static struct avtab_node* |
35 | avtab_insert_node(struct avtab *h, int hvalue, | 35 | avtab_insert_node(struct avtab *h, int hvalue, |
36 | struct avtab_node * prev, struct avtab_node * cur, | 36 | struct avtab_node *prev, struct avtab_node *cur, |
37 | struct avtab_key *key, struct avtab_datum *datum) | 37 | struct avtab_key *key, struct avtab_datum *datum) |
38 | { | 38 | { |
39 | struct avtab_node * newnode; | 39 | struct avtab_node *newnode; |
40 | newnode = kmem_cache_zalloc(avtab_node_cachep, GFP_KERNEL); | 40 | newnode = kmem_cache_zalloc(avtab_node_cachep, GFP_KERNEL); |
41 | if (newnode == NULL) | 41 | if (newnode == NULL) |
42 | return NULL; | 42 | return NULL; |
@@ -84,7 +84,7 @@ static int avtab_insert(struct avtab *h, struct avtab_key *key, struct avtab_dat | |||
84 | } | 84 | } |
85 | 85 | ||
86 | newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum); | 86 | newnode = avtab_insert_node(h, hvalue, prev, cur, key, datum); |
87 | if(!newnode) | 87 | if (!newnode) |
88 | return -ENOMEM; | 88 | return -ENOMEM; |
89 | 89 | ||
90 | return 0; | 90 | return 0; |
@@ -95,7 +95,7 @@ static int avtab_insert(struct avtab *h, struct avtab_key *key, struct avtab_dat | |||
95 | * It also returns a pointer to the node inserted. | 95 | * It also returns a pointer to the node inserted. |
96 | */ | 96 | */ |
97 | struct avtab_node * | 97 | struct avtab_node * |
98 | avtab_insert_nonunique(struct avtab * h, struct avtab_key * key, struct avtab_datum * datum) | 98 | avtab_insert_nonunique(struct avtab *h, struct avtab_key *key, struct avtab_datum *datum) |
99 | { | 99 | { |
100 | int hvalue; | 100 | int hvalue; |
101 | struct avtab_node *prev, *cur, *newnode; | 101 | struct avtab_node *prev, *cur, *newnode; |
@@ -326,7 +326,7 @@ static uint16_t spec_order[] = { | |||
326 | }; | 326 | }; |
327 | 327 | ||
328 | int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol, | 328 | int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol, |
329 | int (*insertf)(struct avtab *a, struct avtab_key *k, | 329 | int (*insertf)(struct avtab *a, struct avtab_key *k, |
330 | struct avtab_datum *d, void *p), | 330 | struct avtab_datum *d, void *p), |
331 | void *p) | 331 | void *p) |
332 | { | 332 | { |
@@ -398,7 +398,8 @@ int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol, | |||
398 | key.specified = spec_order[i] | enabled; | 398 | key.specified = spec_order[i] | enabled; |
399 | datum.data = le32_to_cpu(buf32[items++]); | 399 | datum.data = le32_to_cpu(buf32[items++]); |
400 | rc = insertf(a, &key, &datum, p); | 400 | rc = insertf(a, &key, &datum, p); |
401 | if (rc) return rc; | 401 | if (rc) |
402 | return rc; | ||
402 | } | 403 | } |
403 | } | 404 | } |
404 | 405 | ||
@@ -513,5 +514,5 @@ void avtab_cache_init(void) | |||
513 | 514 | ||
514 | void avtab_cache_destroy(void) | 515 | void avtab_cache_destroy(void) |
515 | { | 516 | { |
516 | kmem_cache_destroy (avtab_node_cachep); | 517 | kmem_cache_destroy(avtab_node_cachep); |
517 | } | 518 | } |