aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/cipso_ipv4.h2
-rw-r--r--include/net/netlabel.h1
-rw-r--r--net/netlabel/netlabel_domainhash.h4
-rw-r--r--net/netlabel/netlabel_user.h5
-rw-r--r--security/selinux/include/selinux_netlabel.h9
5 files changed, 19 insertions, 2 deletions
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index 5aed72ab652b..59406e0dc5b2 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -37,6 +37,8 @@
37#include <linux/types.h> 37#include <linux/types.h>
38#include <linux/rcupdate.h> 38#include <linux/rcupdate.h>
39#include <linux/list.h> 39#include <linux/list.h>
40#include <linux/net.h>
41#include <linux/skbuff.h>
40#include <net/netlabel.h> 42#include <net/netlabel.h>
41 43
42/* known doi values */ 44/* known doi values */
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 7cae730832c7..fc2b72fc7e07 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -31,6 +31,7 @@
31#define _NETLABEL_H 31#define _NETLABEL_H
32 32
33#include <linux/types.h> 33#include <linux/types.h>
34#include <linux/net.h>
34#include <linux/skbuff.h> 35#include <linux/skbuff.h>
35#include <net/netlink.h> 36#include <net/netlink.h>
36 37
diff --git a/net/netlabel/netlabel_domainhash.h b/net/netlabel/netlabel_domainhash.h
index 9217863ce0d3..99a2287de246 100644
--- a/net/netlabel/netlabel_domainhash.h
+++ b/net/netlabel/netlabel_domainhash.h
@@ -32,6 +32,10 @@
32#ifndef _NETLABEL_DOMAINHASH_H 32#ifndef _NETLABEL_DOMAINHASH_H
33#define _NETLABEL_DOMAINHASH_H 33#define _NETLABEL_DOMAINHASH_H
34 34
35#include <linux/types.h>
36#include <linux/rcupdate.h>
37#include <linux/list.h>
38
35/* Domain hash table size */ 39/* Domain hash table size */
36/* XXX - currently this number is an uneducated guess */ 40/* XXX - currently this number is an uneducated guess */
37#define NETLBL_DOMHSH_BITSIZE 7 41#define NETLBL_DOMHSH_BITSIZE 7
diff --git a/net/netlabel/netlabel_user.h b/net/netlabel/netlabel_user.h
index ccf237b3a128..385a6c7488c6 100644
--- a/net/netlabel/netlabel_user.h
+++ b/net/netlabel/netlabel_user.h
@@ -31,11 +31,12 @@
31#ifndef _NETLABEL_USER_H 31#ifndef _NETLABEL_USER_H
32#define _NETLABEL_USER_H 32#define _NETLABEL_USER_H
33 33
34#include <linux/types.h>
34#include <linux/skbuff.h> 35#include <linux/skbuff.h>
35#include <linux/capability.h> 36#include <linux/capability.h>
36#include <linux/genetlink.h> 37#include <net/netlink.h>
37#include <net/netlabel.h>
38#include <net/genetlink.h> 38#include <net/genetlink.h>
39#include <net/netlabel.h>
39 40
40/* NetLabel NETLINK helper functions */ 41/* NetLabel NETLINK helper functions */
41 42
diff --git a/security/selinux/include/selinux_netlabel.h b/security/selinux/include/selinux_netlabel.h
index d69ec650cdbe..ecab4bddaaf4 100644
--- a/security/selinux/include/selinux_netlabel.h
+++ b/security/selinux/include/selinux_netlabel.h
@@ -27,6 +27,15 @@
27#ifndef _SELINUX_NETLABEL_H_ 27#ifndef _SELINUX_NETLABEL_H_
28#define _SELINUX_NETLABEL_H_ 28#define _SELINUX_NETLABEL_H_
29 29
30#include <linux/types.h>
31#include <linux/fs.h>
32#include <linux/net.h>
33#include <linux/skbuff.h>
34#include <net/sock.h>
35
36#include "avc.h"
37#include "objsec.h"
38
30#ifdef CONFIG_NETLABEL 39#ifdef CONFIG_NETLABEL
31void selinux_netlbl_cache_invalidate(void); 40void selinux_netlbl_cache_invalidate(void);
32int selinux_netlbl_socket_post_create(struct socket *sock, 41int selinux_netlbl_socket_post_create(struct socket *sock,