diff options
| author |   James Morris <james.l.morris@oracle.com> | 2014-01-07 01:45:59 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-01-07 01:45:59 +1100 |
| commit | d4a82a4a033d563f1dc2c944eec2358cb38432d0 (patch) | |
| tree | 83f8fca138299584d47930d2509151ea38050253 /security/selinux/ss/policydb.h | |
| parent | tpm/tpm-sysfs: active_show() can be static (diff) | |
| parent | selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock() (diff) | |
| download | linux-dev-d4a82a4a033d563f1dc2c944eec2358cb38432d0.tar.xz linux-dev-d4a82a4a033d563f1dc2c944eec2358cb38432d0.zip | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
Conflicts:
security/selinux/hooks.c
Resolved using request struct.
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security/selinux/ss/policydb.h')
| -rw-r--r-- | security/selinux/ss/policydb.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/security/selinux/ss/policydb.h b/security/selinux/ss/policydb.h index da637471d4ce..725d5945a97e 100644 --- a/security/selinux/ss/policydb.h +++ b/security/selinux/ss/policydb.h @@ -154,6 +154,17 @@ struct cond_bool_datum { struct cond_node; /* + * type set preserves data needed to determine constraint info from + * policy source. This is not used by the kernel policy but allows + * utilities such as audit2allow to determine constraint denials. + */ +struct type_set { + struct ebitmap types; + struct ebitmap negset; + u32 flags; +}; + +/* * The configuration data includes security contexts for * initial SIDs, unlabeled file systems, TCP and UDP port numbers, * network interfaces, and nodes. This structure stores the |