Merge branch 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: validate kernel object classes and permissions
  SELinux: ensure keys constant in hashtab_search
  SELinux: export object class and permission definitions
  SELinux: remove current object class and permission validation mechanism

1 files changed, 24 insertions, 0 deletions

diff --git a/security/selinux/include/avc_ss.h b/security/selinux/include/avc_ss.h
index 450a2831e2e3..ff869e8b6f4a 100644
--- a/security/selinux/include/avc_ss.h
+++ b/security/selinux/include/avc_ss.h
@@ -10,5 +10,29 @@
 
 int avc_ss_reset(u32 seqno);
 
+struct av_perm_to_string
+{
+        u16 tclass;
+        u32 value;
+        const char *name;
+};
+
+struct av_inherit
+{
+        u16 tclass;
+        const char **common_pts;
+        u32 common_base;
+};
+
+struct selinux_class_perm
+{
+        const struct av_perm_to_string *av_perm_to_string;
+        u32 av_pts_len;
+        const char **class_to_string;
+        u32 cts_len;
+        const struct av_inherit *av_inherit;
+        u32 av_inherit_len;
+};
+
 #endif /* _SELINUX_AVC_SS_H_ */