NetLabel: convert to an extensibile/sparse category bitmap

[linux-2.6-omap-h63xx.git] / security / selinux / ss / ebitmap.h

diff --git a/security/selinux/ss/ebitmap.h b/security/selinux/ss/ebitmap.h
index da2d4651b10d440612d7cf9cec45016676eae0cf..1270e34b61c1a97bc3e2f5227efa845bb1d35c3b 100644 (file)
--- a/security/selinux/ss/ebitmap.h
+++ b/security/selinux/ss/ebitmap.h
@@ -14,6 +14,8 @@
 #ifndef _SS_EBITMAP_H_
 #define _SS_EBITMAP_H_
 
+#include <net/netlabel.h>
+
 #define MAPTYPE u64                    /* portion of bitmap in each node */
 #define MAPSIZE (sizeof(MAPTYPE) * 8)  /* number of bits in node bitmap */
 #define MAPBIT  1ULL                   /* a bit in the node bitmap */
@@ -69,16 +71,28 @@ static inline int ebitmap_node_get_bit(struct ebitmap_node * n,
 
 int ebitmap_cmp(struct ebitmap *e1, struct ebitmap *e2);
 int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src);
-int ebitmap_export(const struct ebitmap *src,
-                  unsigned char **dst,
-                  size_t *dst_len);
-int ebitmap_import(const unsigned char *src,
-                  size_t src_len,
-                  struct ebitmap *dst);
 int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2);
 int ebitmap_get_bit(struct ebitmap *e, unsigned long bit);
 int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value);
 void ebitmap_destroy(struct ebitmap *e);
 int ebitmap_read(struct ebitmap *e, void *fp);
 
+#ifdef CONFIG_NETLABEL
+int ebitmap_netlbl_export(struct ebitmap *ebmap,
+                         struct netlbl_lsm_secattr_catmap **catmap);
+int ebitmap_netlbl_import(struct ebitmap *ebmap,
+                         struct netlbl_lsm_secattr_catmap *catmap);
+#else
+static inline int ebitmap_netlbl_export(struct ebitmap *ebmap,
+                               struct netlbl_lsm_secattr_catmap **catmap)
+{
+       return -ENOMEM;
+}
+static inline int ebitmap_netlbl_import(struct ebitmap *ebmap,
+                               struct netlbl_lsm_secattr_catmap *catmap)
+{
+       return -ENOMEM;
+}
+#endif
+
 #endif /* _SS_EBITMAP_H_ */