Re: [PATCH 06/12] selinux: Add IB End Port SMP access vector

[Paul Moore]

On Thu, Jun 23, 2016 at 3:52 PM, Dan Jurgens  wrote:
> From: Daniel Jurgens 
>
> Add a type for Infiniband end ports and an access vector for subnet
> management packets. Implement the ib_end_port_smp hook to check that the
> caller has permission to send and receive SMPs on the end port specified
> by the device name and port.  Add interface to query the SID for a IB
> end port, which walks the IB_END_PORT ocontexts to find an entry for the
> given name and port.
>
> Signed-off-by: Daniel Jurgens 
> Reviewed-by: Eli Cohen 
> ---
>  include/linux/lsm_audit.h| 32 +++---
>  security/selinux/hooks.c | 27 +++
>  security/selinux/include/classmap.h  |  2 ++
>  security/selinux/include/initial_sid_to_string.h |  1 +
>  security/selinux/include/security.h  |  2 ++
>  security/selinux/ss/services.c   | 43 
> 
>  6 files changed, 95 insertions(+), 12 deletions(-)
>
> diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
> index 8ff7eae..acf6de7 100644
> --- a/include/linux/lsm_audit.h
> +++ b/include/linux/lsm_audit.h
> @@ -21,6 +21,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>
>  struct lsm_network_audit {
> int netif;
> @@ -50,21 +51,27 @@ struct lsm_pkey_audit {
> u16 pkey;
>  };
>
> +struct lsm_ib_end_port_audit {
> +   chardev_name[IB_DEVICE_NAME_MAX];
> +   u8  port;
> +};
> +
>  /* Auxiliary data to use in generating the audit record. */
>  struct common_audit_data {
> char type;
> -#define LSM_AUDIT_DATA_PATH1
> -#define LSM_AUDIT_DATA_NET 2
> -#define LSM_AUDIT_DATA_CAP 3
> -#define LSM_AUDIT_DATA_IPC 4
> -#define LSM_AUDIT_DATA_TASK5
> -#define LSM_AUDIT_DATA_KEY 6
> -#define LSM_AUDIT_DATA_NONE7
> -#define LSM_AUDIT_DATA_KMOD8
> -#define LSM_AUDIT_DATA_INODE   9
> -#define LSM_AUDIT_DATA_DENTRY  10
> -#define LSM_AUDIT_DATA_IOCTL_OP11
> -#define LSM_AUDIT_DATA_PKEY12
> +#define LSM_AUDIT_DATA_PATH1
> +#define LSM_AUDIT_DATA_NET 2
> +#define LSM_AUDIT_DATA_CAP 3
> +#define LSM_AUDIT_DATA_IPC 4
> +#define LSM_AUDIT_DATA_TASK5
> +#define LSM_AUDIT_DATA_KEY 6
> +#define LSM_AUDIT_DATA_NONE7
> +#define LSM_AUDIT_DATA_KMOD8
> +#define LSM_AUDIT_DATA_INODE   9
> +#define LSM_AUDIT_DATA_DENTRY  10
> +#define LSM_AUDIT_DATA_IOCTL_OP11
> +#define LSM_AUDIT_DATA_PKEY12
> +#define LSM_AUDIT_DATA_IB_END_PORT 13

Some more nit picking ... if you convert "END_PORT" in the other macro
to "ENDPORT" as we discussed, please do the same here.


> union   {
> struct path path;
> struct dentry *dentry;
> @@ -82,6 +89,7 @@ struct common_audit_data {
> char *kmod_name;
> struct lsm_ioctlop_audit *op;
> struct lsm_pkey_audit *pkey;
> +   struct lsm_ib_end_port_audit *ib_end_port;
> } u;
> /* this union contains LSM specific data */
> union {
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 5a40b10..fc44542 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -6056,6 +6056,32 @@ static int selinux_ib_mad_agent_pkey_access(u64 
> subnet_prefix, u16 pkey_val,
> mad_agent->m_security);
>  }
>
> +static int selinux_ib_end_port_smp(const char *dev_name, u8 port,
> +  struct ib_mad_agent *mad_agent)
> +{
> +   struct common_audit_data ad;
> +   int err;
> +   u32 sid = 0;
> +   struct ib_security_struct *sec = mad_agent->m_security;
> +   struct lsm_ib_end_port_audit ib_end_port;
> +
> +   err = security_ib_end_port_sid(dev_name, port, );
> +
> +   if (err)
> +   goto out;

Just return, don't jump then return.

> +   ad.type = LSM_AUDIT_DATA_IB_END_PORT;
> +   strncpy(ib_end_port.dev_name, dev_name, sizeof(ib_end_port.dev_name));

Do we need to force a NULL byte string terminator here?

> +   ib_end_port.port = port;
> +   ad.u.ib_end_port = _end_port;
> +   err = avc_has_perm(sec->sid, sid,
> +  SECCLASS_INFINIBAND_END_PORT,
> +  INFINIBAND_END_PORT__SMP, );
> +
> +out:
> +   return err;
> +}
> +
>  static int selinux_ib_qp_alloc_security(struct ib_qp_security *qp_sec)
>  {
> struct ib_security_struct *sec;
> @@ -6289,6 +6315,7 @@ static struct security_hook_list selinux_hooks[] = {
> LSM_HOOK_INIT(ib_qp_pkey_access, selinux_ib_qp_pkey_access),
> LSM_HOOK_INIT(ib_mad_agent_pkey_access,
>   selinux_ib_mad_agent_pkey_access),
> +   LSM_HOOK_INIT(ib_end_port_smp, 

Re: [PATCH 06/12] selinux: Add IB End Port SMP access vector

[Yuval Shaia]

On Thu, Jun 23, 2016 at 10:52:52PM +0300, Dan Jurgens wrote:
> From: Daniel Jurgens 
> 
> Add a type for Infiniband end ports and an access vector for subnet
> management packets. Implement the ib_end_port_smp hook to check that the
> caller has permission to send and receive SMPs on the end port specified
> by the device name and port.  Add interface to query the SID for a IB

Extra space before " Add"

> end port, which walks the IB_END_PORT ocontexts to find an entry for the
> given name and port.
> 
> Signed-off-by: Daniel Jurgens 
> Reviewed-by: Eli Cohen 
> ---
>  include/linux/lsm_audit.h| 32 +++---
>  security/selinux/hooks.c | 27 +++
>  security/selinux/include/classmap.h  |  2 ++
>  security/selinux/include/initial_sid_to_string.h |  1 +
>  security/selinux/include/security.h  |  2 ++
>  security/selinux/ss/services.c   | 43 
> 
>  6 files changed, 95 insertions(+), 12 deletions(-)
> 
> diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
> index 8ff7eae..acf6de7 100644
> --- a/include/linux/lsm_audit.h
> +++ b/include/linux/lsm_audit.h
> @@ -21,6 +21,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  struct lsm_network_audit {
>   int netif;
> @@ -50,21 +51,27 @@ struct lsm_pkey_audit {
>   u16 pkey;
>  };
>  
> +struct lsm_ib_end_port_audit {
> + chardev_name[IB_DEVICE_NAME_MAX];
> + u8  port;
> +};
> +
>  /* Auxiliary data to use in generating the audit record. */
>  struct common_audit_data {
>   char type;
> -#define LSM_AUDIT_DATA_PATH  1
> -#define LSM_AUDIT_DATA_NET   2
> -#define LSM_AUDIT_DATA_CAP   3
> -#define LSM_AUDIT_DATA_IPC   4
> -#define LSM_AUDIT_DATA_TASK  5
> -#define LSM_AUDIT_DATA_KEY   6
> -#define LSM_AUDIT_DATA_NONE  7
> -#define LSM_AUDIT_DATA_KMOD  8
> -#define LSM_AUDIT_DATA_INODE 9
> -#define LSM_AUDIT_DATA_DENTRY10
> -#define LSM_AUDIT_DATA_IOCTL_OP  11
> -#define LSM_AUDIT_DATA_PKEY  12
> +#define LSM_AUDIT_DATA_PATH  1
> +#define LSM_AUDIT_DATA_NET   2
> +#define LSM_AUDIT_DATA_CAP   3
> +#define LSM_AUDIT_DATA_IPC   4
> +#define LSM_AUDIT_DATA_TASK  5
> +#define LSM_AUDIT_DATA_KEY   6
> +#define LSM_AUDIT_DATA_NONE  7
> +#define LSM_AUDIT_DATA_KMOD  8
> +#define LSM_AUDIT_DATA_INODE 9
> +#define LSM_AUDIT_DATA_DENTRY10
> +#define LSM_AUDIT_DATA_IOCTL_OP  11
> +#define LSM_AUDIT_DATA_PKEY  12
> +#define LSM_AUDIT_DATA_IB_END_PORT   13
>   union   {
>   struct path path;
>   struct dentry *dentry;
> @@ -82,6 +89,7 @@ struct common_audit_data {
>   char *kmod_name;
>   struct lsm_ioctlop_audit *op;
>   struct lsm_pkey_audit *pkey;
> + struct lsm_ib_end_port_audit *ib_end_port;
>   } u;
>   /* this union contains LSM specific data */
>   union {
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 5a40b10..fc44542 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -6056,6 +6056,32 @@ static int selinux_ib_mad_agent_pkey_access(u64 
> subnet_prefix, u16 pkey_val,
>   mad_agent->m_security);
>  }
>  
> +static int selinux_ib_end_port_smp(const char *dev_name, u8 port,
> +struct ib_mad_agent *mad_agent)
> +{
> + struct common_audit_data ad;
> + int err;
> + u32 sid = 0;
> + struct ib_security_struct *sec = mad_agent->m_security;
> + struct lsm_ib_end_port_audit ib_end_port;
> +
> + err = security_ib_end_port_sid(dev_name, port, );
> +
> + if (err)
> + goto out;
> +
> + ad.type = LSM_AUDIT_DATA_IB_END_PORT;
> + strncpy(ib_end_port.dev_name, dev_name, sizeof(ib_end_port.dev_name));
> + ib_end_port.port = port;
> + ad.u.ib_end_port = _end_port;
> + err = avc_has_perm(sec->sid, sid,
> +SECCLASS_INFINIBAND_END_PORT,
> +INFINIBAND_END_PORT__SMP, );
> +
> +out:
> + return err;
> +}
> +
>  static int selinux_ib_qp_alloc_security(struct ib_qp_security *qp_sec)
>  {
>   struct ib_security_struct *sec;
> @@ -6289,6 +6315,7 @@ static struct security_hook_list selinux_hooks[] = {
>   LSM_HOOK_INIT(ib_qp_pkey_access, selinux_ib_qp_pkey_access),
>   LSM_HOOK_INIT(ib_mad_agent_pkey_access,
> selinux_ib_mad_agent_pkey_access),
> + LSM_HOOK_INIT(ib_end_port_smp, selinux_ib_end_port_smp),
>   LSM_HOOK_INIT(ib_qp_alloc_security,
> selinux_ib_qp_alloc_security),
>   LSM_HOOK_INIT(ib_qp_free_security,
> diff --git a/security/selinux/include/classmap.h 
> b/security/selinux/include/classmap.h
> index d42dd4d..21972c8 100644
> --- 

[PATCH 06/12] selinux: Add IB End Port SMP access vector

[Dan Jurgens]

From: Daniel Jurgens 

Add a type for Infiniband end ports and an access vector for subnet
management packets. Implement the ib_end_port_smp hook to check that the
caller has permission to send and receive SMPs on the end port specified
by the device name and port.  Add interface to query the SID for a IB
end port, which walks the IB_END_PORT ocontexts to find an entry for the
given name and port.

Signed-off-by: Daniel Jurgens 
Reviewed-by: Eli Cohen 
---
 include/linux/lsm_audit.h| 32 +++---
 security/selinux/hooks.c | 27 +++
 security/selinux/include/classmap.h  |  2 ++
 security/selinux/include/initial_sid_to_string.h |  1 +
 security/selinux/include/security.h  |  2 ++
 security/selinux/ss/services.c   | 43 
 6 files changed, 95 insertions(+), 12 deletions(-)

diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index 8ff7eae..acf6de7 100644
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 struct lsm_network_audit {
int netif;
@@ -50,21 +51,27 @@ struct lsm_pkey_audit {
u16 pkey;
 };
 
+struct lsm_ib_end_port_audit {
+   chardev_name[IB_DEVICE_NAME_MAX];
+   u8  port;
+};
+
 /* Auxiliary data to use in generating the audit record. */
 struct common_audit_data {
char type;
-#define LSM_AUDIT_DATA_PATH1
-#define LSM_AUDIT_DATA_NET 2
-#define LSM_AUDIT_DATA_CAP 3
-#define LSM_AUDIT_DATA_IPC 4
-#define LSM_AUDIT_DATA_TASK5
-#define LSM_AUDIT_DATA_KEY 6
-#define LSM_AUDIT_DATA_NONE7
-#define LSM_AUDIT_DATA_KMOD8
-#define LSM_AUDIT_DATA_INODE   9
-#define LSM_AUDIT_DATA_DENTRY  10
-#define LSM_AUDIT_DATA_IOCTL_OP11
-#define LSM_AUDIT_DATA_PKEY12
+#define LSM_AUDIT_DATA_PATH1
+#define LSM_AUDIT_DATA_NET 2
+#define LSM_AUDIT_DATA_CAP 3
+#define LSM_AUDIT_DATA_IPC 4
+#define LSM_AUDIT_DATA_TASK5
+#define LSM_AUDIT_DATA_KEY 6
+#define LSM_AUDIT_DATA_NONE7
+#define LSM_AUDIT_DATA_KMOD8
+#define LSM_AUDIT_DATA_INODE   9
+#define LSM_AUDIT_DATA_DENTRY  10
+#define LSM_AUDIT_DATA_IOCTL_OP11
+#define LSM_AUDIT_DATA_PKEY12
+#define LSM_AUDIT_DATA_IB_END_PORT 13
union   {
struct path path;
struct dentry *dentry;
@@ -82,6 +89,7 @@ struct common_audit_data {
char *kmod_name;
struct lsm_ioctlop_audit *op;
struct lsm_pkey_audit *pkey;
+   struct lsm_ib_end_port_audit *ib_end_port;
} u;
/* this union contains LSM specific data */
union {
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 5a40b10..fc44542 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -6056,6 +6056,32 @@ static int selinux_ib_mad_agent_pkey_access(u64 
subnet_prefix, u16 pkey_val,
mad_agent->m_security);
 }
 
+static int selinux_ib_end_port_smp(const char *dev_name, u8 port,
+  struct ib_mad_agent *mad_agent)
+{
+   struct common_audit_data ad;
+   int err;
+   u32 sid = 0;
+   struct ib_security_struct *sec = mad_agent->m_security;
+   struct lsm_ib_end_port_audit ib_end_port;
+
+   err = security_ib_end_port_sid(dev_name, port, );
+
+   if (err)
+   goto out;
+
+   ad.type = LSM_AUDIT_DATA_IB_END_PORT;
+   strncpy(ib_end_port.dev_name, dev_name, sizeof(ib_end_port.dev_name));
+   ib_end_port.port = port;
+   ad.u.ib_end_port = _end_port;
+   err = avc_has_perm(sec->sid, sid,
+  SECCLASS_INFINIBAND_END_PORT,
+  INFINIBAND_END_PORT__SMP, );
+
+out:
+   return err;
+}
+
 static int selinux_ib_qp_alloc_security(struct ib_qp_security *qp_sec)
 {
struct ib_security_struct *sec;
@@ -6289,6 +6315,7 @@ static struct security_hook_list selinux_hooks[] = {
LSM_HOOK_INIT(ib_qp_pkey_access, selinux_ib_qp_pkey_access),
LSM_HOOK_INIT(ib_mad_agent_pkey_access,
  selinux_ib_mad_agent_pkey_access),
+   LSM_HOOK_INIT(ib_end_port_smp, selinux_ib_end_port_smp),
LSM_HOOK_INIT(ib_qp_alloc_security,
  selinux_ib_qp_alloc_security),
LSM_HOOK_INIT(ib_qp_free_security,
diff --git a/security/selinux/include/classmap.h 
b/security/selinux/include/classmap.h
index d42dd4d..21972c8 100644
--- a/security/selinux/include/classmap.h
+++ b/security/selinux/include/classmap.h
@@ -167,5 +167,7 @@ struct security_class_mapping secclass_map[] = {
  { COMMON_CAP2_PERMS, NULL } },
{ "infiniband_pkey",
  { "access", NULL } },
+