selinux: move ibpkeys code under CONFIG_SECURITY_INFINIBAND.
PATCH v4 1/1 selinux: move ibpkeys code under CONFIG_SECURITY_INFINIBAND.
Move cache based pkey sid retrieval code which was added with Commit "409dcf31" under CONFIG_SECURITY_INFINIBAND. As its going to alloc a new cache which impacts low ram devices which was enabled by default.
--- security/selinux/Makefile | 4 +++- security/selinux/include/ibpkey.h | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-)
security/selinux/Makefile +3 -1
@@ -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
security/selinux/include/ibpkey.h +12 -0
@@ -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 ) { +return ; +} + +static inline int sel_ib_pkey_sid (u64 subnet_prefix,u16 pkey,u32 *sid) { + *sid =SECINITSID_UNLABELED ; +return 0 ; +} +#endif +#endif
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Paul Moore
maintainerQuoted 6 lines · Ravi Kumar Siddojigari
Move cache based pkey sid retrieval code which was added with Commit "
409dcf31" underCONFIG_SECURITY_INFINIBAND. As its going to alloc a new cache which impacts low ram devices which was enabled by default.
Quoted 6 lines
Suggested-by Paul Moore <[email protected]>Signed-off-by Ravi Kumar Siddojigari <[email protected]>--- security/selinux/Makefile | 4 +++- security/selinux/include/ibpkey.h | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-)
I just merged this into selinux/next but I had to fix a few style errors that were found by scripts/checkpatch.pl (whitespace, function braces); please remember to run checkpatch.pl on all your patch submissions.
-Paul
Quoted 50 lines
security/selinux/Makefile +3
-1@@ -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.hsecurity/selinux/include/ibpkey.h +12
-1@@ -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 ) { +return ; +} + +static inline int sel_ib_pkey_sid (u64 subnet_prefix,u16 pkey,u32 *sid) { + *sid =SECINITSID_UNLABELED ; +return 0 ; +} +#endif +#endif --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Signature · 2 lines
paul moore www.paul-moore.com