diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-08-15 13:29:57 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-08-15 13:29:57 +1000 |
| commit | 3e5f206c00f73f535c914eedc8b91f424c5a14ab (patch) | |
| tree | 209f621fc8a9b84053bb4feda619185e17242982 /security/selinux/ss/conditional.h | |
| parent | 0e38c35815f50e5a347977d76fb5eb4c3bf020b5 (diff) | |
| parent | fda4d578ed0a7e1d116f56a15efea0e4ba78acad (diff) | |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/ss/conditional.h')
| -rw-r--r-- | security/selinux/ss/conditional.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h index 4d1f87466508..ddb43e7e1c75 100644 --- a/security/selinux/ss/conditional.h +++ b/security/selinux/ss/conditional.h @@ -73,8 +73,10 @@ int cond_read_list(struct policydb *p, void *fp); int cond_write_bool(void *key, void *datum, void *ptr); int cond_write_list(struct policydb *p, struct cond_node *list, void *fp); -void cond_compute_av(struct avtab *ctab, struct avtab_key *key, struct av_decision *avd); - +void cond_compute_av(struct avtab *ctab, struct avtab_key *key, + struct av_decision *avd, struct extended_perms *xperms); +void cond_compute_xperms(struct avtab *ctab, struct avtab_key *key, + struct extended_perms_decision *xpermd); int evaluate_cond_node(struct policydb *p, struct cond_node *node); #endif /* _CONDITIONAL_H_ */ |