projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NetLabel: convert to an extensibile/sparse category bitmap
[cascardo/linux.git]
/
security
/
selinux
/
ss
/
avtab.c
diff --git
a/security/selinux/ss/avtab.c
b/security/selinux/ss/avtab.c
index
2e71af6
..
d049c7a
100644
(file)
--- a/
security/selinux/ss/avtab.c
+++ b/
security/selinux/ss/avtab.c
@@
-297,8
+297,10
@@
int avtab_read_item(void *fp, u32 vers, struct avtab *a,
struct avtab_datum *d, void *p),
void *p)
{
struct avtab_datum *d, void *p),
void *p)
{
- u16 buf16[4], enabled;
- u32 buf32[7], items, items2, val;
+ __le16 buf16[4];
+ u16 enabled;
+ __le32 buf32[7];
+ u32 items, items2, val;
struct avtab_key key;
struct avtab_datum datum;
int i, rc;
struct avtab_key key;
struct avtab_datum datum;
int i, rc;
@@
-357,7
+359,7
@@
int avtab_read_item(void *fp, u32 vers, struct avtab *a,
return -1;
}
return -1;
}
- for (i = 0; i <
sizeof(spec_order)/sizeof(u16
); i++) {
+ for (i = 0; i <
ARRAY_SIZE(spec_order
); i++) {
if (val & spec_order[i]) {
key.specified = spec_order[i] | enabled;
datum.data = le32_to_cpu(buf32[items++]);
if (val & spec_order[i]) {
key.specified = spec_order[i] | enabled;
datum.data = le32_to_cpu(buf32[items++]);
@@
-403,7
+405,7
@@
static int avtab_insertf(struct avtab *a, struct avtab_key *k,
int avtab_read(struct avtab *a, void *fp, u32 vers)
{
int rc;
int avtab_read(struct avtab *a, void *fp, u32 vers)
{
int rc;
-
u
32 buf[1];
+
__le
32 buf[1];
u32 nel, i;
u32 nel, i;