|
4 | 4 | *
|
5 | 5 | * Author : Stephen Smalley, <[email protected]>
|
6 | 6 | */
|
| 7 | + |
7 | 8 | /*
|
8 | 9 | * Updated: Trusted Computer Solutions, Inc. <[email protected]>
|
9 |
| - * |
10 |
| - * Support for enhanced MLS infrastructure. |
11 |
| - * |
12 |
| - * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. |
| 10 | + * Support for enhanced MLS infrastructure. |
| 11 | + * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. |
13 | 12 | */
|
14 | 13 |
|
15 | 14 | #ifndef _SS_MLS_TYPES_H_
|
|
19 | 18 | #include "ebitmap.h"
|
20 | 19 |
|
21 | 20 | struct mls_level {
|
22 |
| - u32 sens; /* sensitivity */ |
23 |
| - struct ebitmap cat; /* category set */ |
| 21 | + u32 sens; /* sensitivity */ |
| 22 | + struct ebitmap cat; /* category set */ |
24 | 23 | };
|
25 | 24 |
|
26 | 25 | struct mls_range {
|
27 | 26 | struct mls_level level[2]; /* low == level[0], high == level[1] */
|
28 | 27 | };
|
29 | 28 |
|
30 |
| -static inline int mls_level_eq(const struct mls_level *l1, const struct mls_level *l2) |
| 29 | +static inline int mls_level_eq(const struct mls_level *l1, |
| 30 | + const struct mls_level *l2) |
31 | 31 | {
|
32 |
| - return ((l1->sens == l2->sens) && |
33 |
| - ebitmap_cmp(&l1->cat, &l2->cat)); |
| 32 | + return ((l1->sens == l2->sens) && ebitmap_cmp(&l1->cat, &l2->cat)); |
34 | 33 | }
|
35 | 34 |
|
36 |
| -static inline int mls_level_dom(const struct mls_level *l1, const struct mls_level *l2) |
| 35 | +static inline int mls_level_dom(const struct mls_level *l1, |
| 36 | + const struct mls_level *l2) |
37 | 37 | {
|
38 | 38 | return ((l1->sens >= l2->sens) &&
|
39 | 39 | ebitmap_contains(&l1->cat, &l2->cat, 0));
|
40 | 40 | }
|
41 | 41 |
|
42 | 42 | #define mls_level_incomp(l1, l2) \
|
43 |
| -(!mls_level_dom((l1), (l2)) && !mls_level_dom((l2), (l1))) |
| 43 | + (!mls_level_dom((l1), (l2)) && !mls_level_dom((l2), (l1))) |
44 | 44 |
|
45 | 45 | #define mls_level_between(l1, l2, l3) \
|
46 |
| -(mls_level_dom((l1), (l2)) && mls_level_dom((l3), (l1))) |
| 46 | + (mls_level_dom((l1), (l2)) && mls_level_dom((l3), (l1))) |
47 | 47 |
|
48 |
| -#define mls_range_contains(r1, r2) \ |
49 |
| -(mls_level_dom(&(r2).level[0], &(r1).level[0]) && \ |
50 |
| - mls_level_dom(&(r1).level[1], &(r2).level[1])) |
| 48 | +#define mls_range_contains(r1, r2) \ |
| 49 | + (mls_level_dom(&(r2).level[0], &(r1).level[0]) && \ |
| 50 | + mls_level_dom(&(r1).level[1], &(r2).level[1])) |
51 | 51 |
|
52 |
| -#endif /* _SS_MLS_TYPES_H_ */ |
| 52 | +#endif /* _SS_MLS_TYPES_H_ */ |
0 commit comments