diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /security/selinux/ss/avtab.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'security/selinux/ss/avtab.c')
| -rw-r--r-- | security/selinux/ss/avtab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c index dde094feb20d..d049c7acbc8b 100644 --- a/security/selinux/ss/avtab.c +++ b/security/selinux/ss/avtab.c | |||
| @@ -359,7 +359,7 @@ int avtab_read_item(void *fp, u32 vers, struct avtab *a, | |||
| 359 | return -1; | 359 | return -1; |
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | for (i = 0; i < sizeof(spec_order)/sizeof(u16); i++) { | 362 | for (i = 0; i < ARRAY_SIZE(spec_order); i++) { |
| 363 | if (val & spec_order[i]) { | 363 | if (val & spec_order[i]) { |
| 364 | key.specified = spec_order[i] | enabled; | 364 | key.specified = spec_order[i] | enabled; |
| 365 | datum.data = le32_to_cpu(buf32[items++]); | 365 | datum.data = le32_to_cpu(buf32[items++]); |