diff options
author | James Morris <james.l.morris@oracle.com> | 2014-09-30 18:45:26 +0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-09-30 18:45:26 +0400 |
commit | 858f61c4298d858376ca7b9fc2e05677faabd2d5 (patch) | |
tree | 6f5fdef7f8d129a76a49674eb42dfca83b672099 /security/selinux/include | |
parent | 6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1 (diff) | |
parent | 4093a8443941d7021c7f747474a87a56cf666270 (diff) | |
download | linux-858f61c4298d858376ca7b9fc2e05677faabd2d5.tar.xz |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/include')
-rw-r--r-- | security/selinux/include/netif.h | 4 | ||||
-rw-r--r-- | security/selinux/include/objsec.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/security/selinux/include/netif.h b/security/selinux/include/netif.h index 57c6eae81eac..c72145444090 100644 --- a/security/selinux/include/netif.h +++ b/security/selinux/include/netif.h @@ -17,9 +17,11 @@ #ifndef _SELINUX_NETIF_H_ #define _SELINUX_NETIF_H_ +#include <net/net_namespace.h> + void sel_netif_flush(void); -int sel_netif_sid(int ifindex, u32 *sid); +int sel_netif_sid(struct net *ns, int ifindex, u32 *sid); #endif /* _SELINUX_NETIF_H_ */ diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index 078e553f52f2..81fa718d5cb3 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h @@ -24,6 +24,7 @@ #include <linux/binfmts.h> #include <linux/in.h> #include <linux/spinlock.h> +#include <net/net_namespace.h> #include "flask.h" #include "avc.h" @@ -78,6 +79,7 @@ struct ipc_security_struct { }; struct netif_security_struct { + struct net *ns; /* network namespace */ int ifindex; /* device index */ u32 sid; /* SID for this interface */ }; |