Re: [PATCH v2 8/9] selinux: Add IB Port SMP access vector

2016-07-28 Thread Daniel Jurgens
On 7/22/2016 2:26 PM, Paul Moore wrote:
> On Thu, Jul 14, 2016 at 6:56 PM, Dan Jurgens  wrote:
>
>> +   audit_log_format(ab, " port=%u", a->u.ib_port->port);
> Based on our other conversations, I'm guessing that should be " endport=%u"?

I think port is fine there, device name and port number.  Together they are an 
"endport".

___
Selinux mailing list
Selinux@tycho.nsa.gov
To unsubscribe, send email to selinux-le...@tycho.nsa.gov.
To get help, send an email containing "help" to selinux-requ...@tycho.nsa.gov.


Re: [PATCH v2 8/9] selinux: Add IB Port SMP access vector

2016-07-22 Thread Paul Moore
On Thu, Jul 14, 2016 at 6:56 PM, Dan Jurgens  wrote:
> From: Daniel Jurgens 
>
> Add a type for Infiniband ports and an access vector for subnet
> management packets. Implement the ib_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
> port, which walks the IB_PORT ocontexts to find an entry for the
> given name and port.
>
> Signed-off-by: Daniel Jurgens 

...

> diff --git a/security/lsm_audit.c b/security/lsm_audit.c
> index 2546d82..95632a9 100644
> --- a/security/lsm_audit.c
> +++ b/security/lsm_audit.c
> @@ -410,6 +410,11 @@ static void dump_common_audit_data(struct audit_buffer 
> *ab,
>  a->u.pkey->pkey, &sbn_pfx);
> break;
> }
> +   case LSM_AUDIT_DATA_IB_PORT:
> +   audit_log_format(ab, " device=");
> +   audit_log_untrustedstring(ab, a->u.ib_port->dev_name);

The device name comes from the driver, right?  We only need to use the
"untrustedstring" logging variant when we are dealing with strings
from userspace that have no guarantees on what they might contain.
Check the audit_string_contains_control() function to see what we
consider "bad" characters.

> +   audit_log_format(ab, " port=%u", a->u.ib_port->port);

Based on our other conversations, I'm guessing that should be " endport=%u"?

> +   break;
> } /* switch (a->type) */
>  }
>
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index d9c4bfa..40ad0e8 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -6017,6 +6017,28 @@ static int selinux_ib_pkey_access(u64 subnet_prefix, 
> u16 pkey_val, void *ib_sec)
> INFINIBAND_PKEY__ACCESS, &ad);
>  }
>
> +static int selinux_ib_port_manage_subnet(const char *dev_name, u8 port, void 
> *ib_sec)
> +{

See my previous comments about argument ordering, in other words, put
ib_sec first to help preserve my sanity in the future.

> +   struct common_audit_data ad;
> +   int err;
> +   u32 sid = 0;
> +   struct ib_security_struct *sec = ib_sec;
> +   struct lsm_ib_port_audit ib_port;
> +
> +   err = security_ib_port_sid(dev_name, port, &sid);
> +
> +   if (err)
> +   return err;
> +
> +   ad.type = LSM_AUDIT_DATA_IB_PORT;
> +   strncpy(ib_port.dev_name, dev_name, sizeof(ib_port.dev_name));
> +   ib_port.port = port;
> +   ad.u.ib_port = &ib_port;
> +   return avc_has_perm(sec->sid, sid,
> +   SECCLASS_INFINIBAND_PORT,
> +   INFINIBAND_PORT__MANAGE_SUBNET, &ad);
> +}
> +

-- 
paul moore
www.paul-moore.com
___
Selinux mailing list
Selinux@tycho.nsa.gov
To unsubscribe, send email to selinux-le...@tycho.nsa.gov.
To get help, send an email containing "help" to selinux-requ...@tycho.nsa.gov.


[PATCH v2 8/9] selinux: Add IB Port SMP access vector

2016-07-15 Thread Dan Jurgens
From: Daniel Jurgens 

Add a type for Infiniband ports and an access vector for subnet
management packets. Implement the ib_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
port, which walks the IB_PORT ocontexts to find an entry for the
given name and port.

Signed-off-by: Daniel Jurgens 

---
v2:
- Shorted ib_end_port. Paul Moore
- Pass void blobs to security hooks. Paul Moore
- Log specific IB port info in audit log. Paul Moore
- Don't create a new intial sid, use unlabeled. Stephen Smalley
- Changed "smp" to "manage_subnet". Paul Moore
---
 include/linux/lsm_audit.h   |   32 --
 security/lsm_audit.c|5 
 security/selinux/hooks.c|   23 +++
 security/selinux/include/classmap.h |2 +
 security/selinux/include/security.h |2 +
 security/selinux/ss/services.c  |   42 +++
 6 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index 8ff7eae..d2f6bda 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_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_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_port_audit *ib_port;
} u;
/* this union contains LSM specific data */
union {
diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 2546d82..95632a9 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -410,6 +410,11 @@ static void dump_common_audit_data(struct audit_buffer *ab,
 a->u.pkey->pkey, &sbn_pfx);
break;
}
+   case LSM_AUDIT_DATA_IB_PORT:
+   audit_log_format(ab, " device=");
+   audit_log_untrustedstring(ab, a->u.ib_port->dev_name);
+   audit_log_format(ab, " port=%u", a->u.ib_port->port);
+   break;
} /* switch (a->type) */
 }
 
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d9c4bfa..40ad0e8 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -6017,6 +6017,28 @@ static int selinux_ib_pkey_access(u64 subnet_prefix, u16 
pkey_val, void *ib_sec)
INFINIBAND_PKEY__ACCESS, &ad);
 }
 
+static int selinux_ib_port_manage_subnet(const char *dev_name, u8 port, void 
*ib_sec)
+{
+   struct common_audit_data ad;
+   int err;
+   u32 sid = 0;
+   struct ib_security_struct *sec = ib_sec;
+   struct lsm_ib_port_audit ib_port;
+
+   err = security_ib_port_sid(dev_name, port, &sid);
+
+   if (err)
+   return err;
+
+   ad.type = LSM_AUDIT_DATA_IB_PORT;
+   strncpy(ib_port.dev_name, dev_name, sizeof(ib_port.dev_name));
+   ib_port.port = port;
+   ad.u.ib_port = &ib_port;
+   return avc_has_perm(sec->sid, sid,
+   SECCLASS_INFINIBAND_PORT,
+   INFINIBAND_PORT__MANAGE_SUBNET, &ad);
+}
+
 static int selinux_ib_alloc_security(void **ib_sec)
 {
struct ib_security_struct *sec;
@@ -6219,6 +6241,7 @@ static struct security_hook_list selinux_hooks[] = {
LSM_HOOK_INIT(tun_dev_open, selinux_tun_dev_open),
 #ifdef CONFIG_SECURITY_INFINIBAND
LSM_HOOK_INIT(ib_pkey_access, selinux_ib_pkey_access),
+   LSM_HOOK_INIT(ib