mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge "selinux: move ibpkeys code under CONFIG_SECURITY_INFINIBAND"
This commit is contained in:
commit
f79ed0dbae
2 changed files with 15 additions and 1 deletions
|
|
@ -6,7 +6,7 @@
|
|||
obj-$(CONFIG_SECURITY_SELINUX) := selinux.o
|
||||
|
||||
selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o \
|
||||
netnode.o netport.o ibpkey.o \
|
||||
netnode.o netport.o \
|
||||
ss/ebitmap.o ss/hashtab.o ss/symtab.o ss/sidtab.o ss/avtab.o \
|
||||
ss/policydb.o ss/services.o ss/conditional.o ss/mls.o ss/status.o
|
||||
|
||||
|
|
@ -14,6 +14,8 @@ selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o
|
|||
|
||||
selinux-$(CONFIG_NETLABEL) += netlabel.o
|
||||
|
||||
selinux-$(CONFIG_SECURITY_INFINIBAND) += ibpkey.o
|
||||
|
||||
ccflags-y := -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include
|
||||
|
||||
$(addprefix $(obj)/,$(selinux-y)): $(obj)/flask.h
|
||||
|
|
|
|||
|
|
@ -14,8 +14,20 @@
|
|||
#ifndef _SELINUX_IB_PKEY_H
|
||||
#define _SELINUX_IB_PKEY_H
|
||||
|
||||
#ifdef CONFIG_SECURITY_INFINIBAND
|
||||
void sel_ib_pkey_flush(void);
|
||||
|
||||
int sel_ib_pkey_sid(u64 subnet_prefix, u16 pkey, u32 *sid);
|
||||
|
||||
#else
|
||||
|
||||
static inline void sel_ib_pkey_flush(void) { }
|
||||
|
||||
static inline int sel_ib_pkey_sid(u64 subnet_prefix, u16 pkey, u32 *sid)
|
||||
{
|
||||
*sid = SECINITSID_UNLABELED;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue