Skip to contentSkip to conversation

selinux: move ibpkeys code under CONFIG_SECURITY_INFINIBAND.

PATCH Superseded Ravi Kumar Siddojigari 2 participants 4 messages Jan 6, 2020 – Jan 7, 2020 SELinux security module

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 selinux: move ibpkeys code under CONFIG_SECURITY_INFINIBAND.

please find the updated patch based on the review comments

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 | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
security/selinux/Makefile +3 -1
index ccf950409384..2000f95fb197 100644
@@ -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 +11 -0
index a2ebe397bcb7..040b93cca486 100644
@@ -14,8 +14,21 @@
 #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;
+}

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 | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
security/selinux/Makefile +3 -1
index ccf950409384..2000f95fb197 100644
@@ -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 +13 -0
index a2ebe397bcb7..040b93cca486 100644
@@ -14,8 +14,21 @@
 #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

maintainer
#1 lore raw
Quoted 1 line · Ravi Kumar Siddojigari

please find the updated patch based on the review comments

Hi Ravi,

I'm not sure how you are posting your patches to the list, but it is causing the patches to be malformed; I am not able to merge this patch in its current condition.

I believe Stephen already provided you some tips on posting patches, but please also go and read the "Documentation/process/submitting-patches.rst" which can be found in the Linux Kernel sources. If you have any questions about how to submit patches after reading that file please let me know.

-Paul

Quoted 120 lines

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 | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
security/selinux/Makefile +3 -1
index ccf950409384..2000f95fb197 100644
@@ -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 +11 -0
index a2ebe397bcb7..040b93cca486 100644
@@ -14,8 +14,21 @@
 #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;
+}

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 | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
security/selinux/Makefile +3 -1
index ccf950409384..2000f95fb197 100644
@@ -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 +13 -1
index a2ebe397bcb7..040b93cca486 100644
@@ -14,8 +14,21 @@
 #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
#2 lore raw

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 | 13 +++++++++++++

 2 files changed, 16 insertions(+), 1 deletion(-)
security/selinux/Makefile +0 -0
index ccf950409384..2000f95fb197 100644
@@ -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 +0 -0
index a2ebe397bcb7..040b93cca486 100644
@@ -14,8 +14,21 @@

 #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

maintainer
#3 lore raw
Quoted 26 lines · Ravi Kumar Siddojigari

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 | 13 +++++++++++++
  2 files changed, 16 insertions(+), 1 deletion(-)
security/selinux/Makefile +1 -1
index ccf950409384..2000f95fb197 100644
@@ -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
 

security/selinux/Makefile selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o · line 18

Quoted 7 lines
security/selinux/Makefile +2 -1
@@ -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

It looks like your email client is wrapping lines (above) and causing the patch to be malformed. The documentation that was mentioned earlier has more information on how to send patches properly via email, it also references a second document with more information on email clients (Documentation/process/email-clients.rst).

At this point I would suggest that you send the patch just to yourself first to verify that you can apply the patch directly from your email; once you have that working you can try sending to the list again.

Signature · 2 lines
paul moore
www.paul-moore.com