selinux: Add netlink xperm support
Reuse the existing extended permissions infrastructure to support policies based on the netlink message types. A new policy capability "netlink_xperm" is introduced. When disabled, the previous behaviour is preserved. That is, netlink_send will rely on the permission mappings defined in nlmsgtab.c (e.g, nlmsg_read for RTM_GETADDR on NETLINK_ROUTE). When enabled, the mappings are ignored and the generic "nlmsg" permission is used instead. The new "nlmsg" permission is an extended permission. The 16 bits of the extended permission are mapped to the nlmsg_type field. Example policy on Android, preventing regular apps from accessing the device's MAC address and ARP table, but allowing this access to privileged apps, looks as follows: allow netdomain self:netlink_route_socket { create read getattr write setattr lock append connect getopt setopt shutdown nlmsg }; allowxperm netdomain self:netlink_route_socket nlmsg ~{ RTM_GETLINK RTM_GETNEIGH RTM_GETNEIGHTBL }; allowxperm priv_app self:netlink_route_socket nlmsg { RTM_GETLINK RTM_GETNEIGH RTM_GETNEIGHTBL }; The constants in the example above (e.g., RTM_GETLINK) are explicitly defined in the policy. It is possible to generate policies to support kernels that may or may not have the capability enabled by generating a rule for each scenario. For instance: allow domain self:netlink_audit_socket nlmsg_read; allow domain self:netlink_audit_socket nlmsg; allowxperm domain self:netlink_audit_socket nlmsg { AUDIT_GET }; The approach of defining a new permission ("nlmsg") instead of relying on the existing permissions (e.g., "nlmsg_read", "nlmsg_readpriv" or "nlmsg_tty_audit") has been preferred because: 1. This is similar to the other extended permission ("ioctl"); 2. With the new extended permission, the coarse-grained mapping is not necessary anymore. It could eventually be removed, which would be impossible if the extended permission was defined below these. 3. Having a single extra extended permission considerably simplifies the implementation here and in libselinux. Signed-off-by: Thiébaud Weksteen <tweek@google.com> Signed-off-by: Bram Bonné <brambonne@google.com> [PM: manual merge fixes for sock_skip_has_perm()] Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
parent
3b70b66e03
commit
d1d991efaf
8 changed files with 126 additions and 51 deletions
|
@ -4590,14 +4590,10 @@ static int socket_sockcreate_sid(const struct task_security_struct *tsec,
|
||||||
secclass, NULL, socksid);
|
secclass, NULL, socksid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sock_has_perm(struct sock *sk, u32 perms)
|
static bool sock_skip_has_perm(u32 sid)
|
||||||
{
|
{
|
||||||
struct sk_security_struct *sksec = selinux_sock(sk);
|
if (sid == SECINITSID_KERNEL)
|
||||||
struct common_audit_data ad;
|
return true;
|
||||||
struct lsm_network_audit net;
|
|
||||||
|
|
||||||
if (sksec->sid == SECINITSID_KERNEL)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Before POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT, sockets that
|
* Before POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT, sockets that
|
||||||
|
@ -4611,7 +4607,19 @@ static int sock_has_perm(struct sock *sk, u32 perms)
|
||||||
* setting.
|
* setting.
|
||||||
*/
|
*/
|
||||||
if (!selinux_policycap_userspace_initial_context() &&
|
if (!selinux_policycap_userspace_initial_context() &&
|
||||||
sksec->sid == SECINITSID_INIT)
|
sid == SECINITSID_INIT)
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int sock_has_perm(struct sock *sk, u32 perms)
|
||||||
|
{
|
||||||
|
struct sk_security_struct *sksec = sk->sk_security;
|
||||||
|
struct common_audit_data ad;
|
||||||
|
struct lsm_network_audit net;
|
||||||
|
|
||||||
|
if (sock_skip_has_perm(sksec->sid))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ad_net_init_from_sk(&ad, &net, sk);
|
ad_net_init_from_sk(&ad, &net, sk);
|
||||||
|
@ -5920,6 +5928,26 @@ static unsigned int selinux_ip_postroute(void *priv,
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_NETFILTER */
|
#endif /* CONFIG_NETFILTER */
|
||||||
|
|
||||||
|
static int nlmsg_sock_has_extended_perms(struct sock *sk, u32 perms, u16 nlmsg_type)
|
||||||
|
{
|
||||||
|
struct sk_security_struct *sksec = sk->sk_security;
|
||||||
|
struct common_audit_data ad;
|
||||||
|
struct lsm_network_audit net;
|
||||||
|
u8 driver;
|
||||||
|
u8 xperm;
|
||||||
|
|
||||||
|
if (sock_skip_has_perm(sksec->sid))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
ad_net_init_from_sk(&ad, &net, sk);
|
||||||
|
|
||||||
|
driver = nlmsg_type >> 8;
|
||||||
|
xperm = nlmsg_type & 0xff;
|
||||||
|
|
||||||
|
return avc_has_extended_perms(current_sid(), sksec->sid, sksec->sclass,
|
||||||
|
perms, driver, xperm, &ad);
|
||||||
|
}
|
||||||
|
|
||||||
static int selinux_netlink_send(struct sock *sk, struct sk_buff *skb)
|
static int selinux_netlink_send(struct sock *sk, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
@ -5945,7 +5973,12 @@ static int selinux_netlink_send(struct sock *sk, struct sk_buff *skb)
|
||||||
|
|
||||||
rc = selinux_nlmsg_lookup(sclass, nlh->nlmsg_type, &perm);
|
rc = selinux_nlmsg_lookup(sclass, nlh->nlmsg_type, &perm);
|
||||||
if (rc == 0) {
|
if (rc == 0) {
|
||||||
rc = sock_has_perm(sk, perm);
|
if (selinux_policycap_netlink_xperm()) {
|
||||||
|
rc = nlmsg_sock_has_extended_perms(
|
||||||
|
sk, perm, nlh->nlmsg_type);
|
||||||
|
} else {
|
||||||
|
rc = sock_has_perm(sk, perm);
|
||||||
|
}
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
} else if (rc == -EINVAL) {
|
} else if (rc == -EINVAL) {
|
||||||
|
|
|
@ -97,17 +97,17 @@ const struct security_class_mapping secclass_map[] = {
|
||||||
{ "shm", { COMMON_IPC_PERMS, "lock", NULL } },
|
{ "shm", { COMMON_IPC_PERMS, "lock", NULL } },
|
||||||
{ "ipc", { COMMON_IPC_PERMS, NULL } },
|
{ "ipc", { COMMON_IPC_PERMS, NULL } },
|
||||||
{ "netlink_route_socket",
|
{ "netlink_route_socket",
|
||||||
{ COMMON_SOCK_PERMS, "nlmsg_read", "nlmsg_write", NULL } },
|
{ COMMON_SOCK_PERMS, "nlmsg_read", "nlmsg_write", "nlmsg", NULL } },
|
||||||
{ "netlink_tcpdiag_socket",
|
{ "netlink_tcpdiag_socket",
|
||||||
{ COMMON_SOCK_PERMS, "nlmsg_read", "nlmsg_write", NULL } },
|
{ COMMON_SOCK_PERMS, "nlmsg_read", "nlmsg_write", "nlmsg", NULL } },
|
||||||
{ "netlink_nflog_socket", { COMMON_SOCK_PERMS, NULL } },
|
{ "netlink_nflog_socket", { COMMON_SOCK_PERMS, NULL } },
|
||||||
{ "netlink_xfrm_socket",
|
{ "netlink_xfrm_socket",
|
||||||
{ COMMON_SOCK_PERMS, "nlmsg_read", "nlmsg_write", NULL } },
|
{ COMMON_SOCK_PERMS, "nlmsg_read", "nlmsg_write", "nlmsg", NULL } },
|
||||||
{ "netlink_selinux_socket", { COMMON_SOCK_PERMS, NULL } },
|
{ "netlink_selinux_socket", { COMMON_SOCK_PERMS, NULL } },
|
||||||
{ "netlink_iscsi_socket", { COMMON_SOCK_PERMS, NULL } },
|
{ "netlink_iscsi_socket", { COMMON_SOCK_PERMS, NULL } },
|
||||||
{ "netlink_audit_socket",
|
{ "netlink_audit_socket",
|
||||||
{ COMMON_SOCK_PERMS, "nlmsg_read", "nlmsg_write", "nlmsg_relay",
|
{ COMMON_SOCK_PERMS, "nlmsg_read", "nlmsg_write", "nlmsg_relay",
|
||||||
"nlmsg_readpriv", "nlmsg_tty_audit", NULL } },
|
"nlmsg_readpriv", "nlmsg_tty_audit", "nlmsg", NULL } },
|
||||||
{ "netlink_fib_lookup_socket", { COMMON_SOCK_PERMS, NULL } },
|
{ "netlink_fib_lookup_socket", { COMMON_SOCK_PERMS, NULL } },
|
||||||
{ "netlink_connector_socket", { COMMON_SOCK_PERMS, NULL } },
|
{ "netlink_connector_socket", { COMMON_SOCK_PERMS, NULL } },
|
||||||
{ "netlink_netfilter_socket", { COMMON_SOCK_PERMS, NULL } },
|
{ "netlink_netfilter_socket", { COMMON_SOCK_PERMS, NULL } },
|
||||||
|
|
|
@ -14,6 +14,7 @@ enum {
|
||||||
POLICYDB_CAP_GENFS_SECLABEL_SYMLINKS,
|
POLICYDB_CAP_GENFS_SECLABEL_SYMLINKS,
|
||||||
POLICYDB_CAP_IOCTL_SKIP_CLOEXEC,
|
POLICYDB_CAP_IOCTL_SKIP_CLOEXEC,
|
||||||
POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT,
|
POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT,
|
||||||
|
POLICYDB_CAP_NETLINK_XPERM,
|
||||||
__POLICYDB_CAP_MAX
|
__POLICYDB_CAP_MAX
|
||||||
};
|
};
|
||||||
#define POLICYDB_CAP_MAX (__POLICYDB_CAP_MAX - 1)
|
#define POLICYDB_CAP_MAX (__POLICYDB_CAP_MAX - 1)
|
||||||
|
|
|
@ -17,6 +17,7 @@ const char *const selinux_policycap_names[__POLICYDB_CAP_MAX] = {
|
||||||
"genfs_seclabel_symlinks",
|
"genfs_seclabel_symlinks",
|
||||||
"ioctl_skip_cloexec",
|
"ioctl_skip_cloexec",
|
||||||
"userspace_initial_context",
|
"userspace_initial_context",
|
||||||
|
"netlink_xperm",
|
||||||
};
|
};
|
||||||
/* clang-format on */
|
/* clang-format on */
|
||||||
|
|
||||||
|
|
|
@ -195,6 +195,12 @@ static inline bool selinux_policycap_userspace_initial_context(void)
|
||||||
selinux_state.policycap[POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT]);
|
selinux_state.policycap[POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline bool selinux_policycap_netlink_xperm(void)
|
||||||
|
{
|
||||||
|
return READ_ONCE(
|
||||||
|
selinux_state.policycap[POLICYDB_CAP_NETLINK_XPERM]);
|
||||||
|
}
|
||||||
|
|
||||||
struct selinux_policy_convert_data;
|
struct selinux_policy_convert_data;
|
||||||
|
|
||||||
struct selinux_load_state {
|
struct selinux_load_state {
|
||||||
|
|
|
@ -170,6 +170,33 @@ int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
|
if (selinux_policycap_netlink_xperm()) {
|
||||||
|
switch (sclass) {
|
||||||
|
case SECCLASS_NETLINK_ROUTE_SOCKET:
|
||||||
|
*perm = NETLINK_ROUTE_SOCKET__NLMSG;
|
||||||
|
break;
|
||||||
|
case SECCLASS_NETLINK_TCPDIAG_SOCKET:
|
||||||
|
*perm = NETLINK_TCPDIAG_SOCKET__NLMSG;
|
||||||
|
break;
|
||||||
|
case SECCLASS_NETLINK_XFRM_SOCKET:
|
||||||
|
*perm = NETLINK_XFRM_SOCKET__NLMSG;
|
||||||
|
break;
|
||||||
|
case SECCLASS_NETLINK_AUDIT_SOCKET:
|
||||||
|
*perm = NETLINK_AUDIT_SOCKET__NLMSG;
|
||||||
|
break;
|
||||||
|
/* While it is possible to add a similar permission to other
|
||||||
|
* netlink classes, note that the extended permission value is
|
||||||
|
* matched against the nlmsg_type field. Notably,
|
||||||
|
* SECCLASS_NETLINK_GENERIC_SOCKET uses dynamic values for this
|
||||||
|
* field, which means that it cannot be added as-is.
|
||||||
|
*/
|
||||||
|
default:
|
||||||
|
err = -ENOENT;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
switch (sclass) {
|
switch (sclass) {
|
||||||
case SECCLASS_NETLINK_ROUTE_SOCKET:
|
case SECCLASS_NETLINK_ROUTE_SOCKET:
|
||||||
/* RTM_MAX always points to RTM_SETxxxx, ie RTM_NEWxxx + 3.
|
/* RTM_MAX always points to RTM_SETxxxx, ie RTM_NEWxxx + 3.
|
||||||
|
|
|
@ -53,8 +53,9 @@ struct avtab_key {
|
||||||
*/
|
*/
|
||||||
struct avtab_extended_perms {
|
struct avtab_extended_perms {
|
||||||
/* These are not flags. All 256 values may be used */
|
/* These are not flags. All 256 values may be used */
|
||||||
#define AVTAB_XPERMS_IOCTLFUNCTION 0x01
|
#define AVTAB_XPERMS_IOCTLFUNCTION 0x01
|
||||||
#define AVTAB_XPERMS_IOCTLDRIVER 0x02
|
#define AVTAB_XPERMS_IOCTLDRIVER 0x02
|
||||||
|
#define AVTAB_XPERMS_NLMSG 0x03
|
||||||
/* extension of the avtab_key specified */
|
/* extension of the avtab_key specified */
|
||||||
u8 specified; /* ioctl, netfilter, ... */
|
u8 specified; /* ioctl, netfilter, ... */
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -582,8 +582,7 @@ static void type_attribute_bounds_av(struct policydb *policydb,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* flag which drivers have permissions
|
* Flag which drivers have permissions.
|
||||||
* only looking for ioctl based extended permissions
|
|
||||||
*/
|
*/
|
||||||
void services_compute_xperms_drivers(
|
void services_compute_xperms_drivers(
|
||||||
struct extended_perms *xperms,
|
struct extended_perms *xperms,
|
||||||
|
@ -591,14 +590,18 @@ void services_compute_xperms_drivers(
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLDRIVER) {
|
switch (node->datum.u.xperms->specified) {
|
||||||
|
case AVTAB_XPERMS_IOCTLDRIVER:
|
||||||
/* if one or more driver has all permissions allowed */
|
/* if one or more driver has all permissions allowed */
|
||||||
for (i = 0; i < ARRAY_SIZE(xperms->drivers.p); i++)
|
for (i = 0; i < ARRAY_SIZE(xperms->drivers.p); i++)
|
||||||
xperms->drivers.p[i] |= node->datum.u.xperms->perms.p[i];
|
xperms->drivers.p[i] |= node->datum.u.xperms->perms.p[i];
|
||||||
} else if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLFUNCTION) {
|
break;
|
||||||
|
case AVTAB_XPERMS_IOCTLFUNCTION:
|
||||||
|
case AVTAB_XPERMS_NLMSG:
|
||||||
/* if allowing permissions within a driver */
|
/* if allowing permissions within a driver */
|
||||||
security_xperm_set(xperms->drivers.p,
|
security_xperm_set(xperms->drivers.p,
|
||||||
node->datum.u.xperms->driver);
|
node->datum.u.xperms->driver);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
xperms->len = 1;
|
xperms->len = 1;
|
||||||
|
@ -942,55 +945,58 @@ static void avd_init(struct selinux_policy *policy, struct av_decision *avd)
|
||||||
avd->flags = 0;
|
avd->flags = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void services_compute_xperms_decision(struct extended_perms_decision *xpermd,
|
static void update_xperms_extended_data(u8 specified,
|
||||||
struct avtab_node *node)
|
struct extended_perms_data *from,
|
||||||
|
struct extended_perms_data *xp_data)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLFUNCTION) {
|
switch (specified) {
|
||||||
|
case AVTAB_XPERMS_IOCTLDRIVER:
|
||||||
|
memset(xp_data->p, 0xff, sizeof(xp_data->p));
|
||||||
|
break;
|
||||||
|
case AVTAB_XPERMS_IOCTLFUNCTION:
|
||||||
|
case AVTAB_XPERMS_NLMSG:
|
||||||
|
for (i = 0; i < ARRAY_SIZE(xp_data->p); i++)
|
||||||
|
xp_data->p[i] |= from->p[i];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void services_compute_xperms_decision(struct extended_perms_decision *xpermd,
|
||||||
|
struct avtab_node *node)
|
||||||
|
{
|
||||||
|
switch (node->datum.u.xperms->specified) {
|
||||||
|
case AVTAB_XPERMS_IOCTLFUNCTION:
|
||||||
|
case AVTAB_XPERMS_NLMSG:
|
||||||
if (xpermd->driver != node->datum.u.xperms->driver)
|
if (xpermd->driver != node->datum.u.xperms->driver)
|
||||||
return;
|
return;
|
||||||
} else if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLDRIVER) {
|
break;
|
||||||
|
case AVTAB_XPERMS_IOCTLDRIVER:
|
||||||
if (!security_xperm_test(node->datum.u.xperms->perms.p,
|
if (!security_xperm_test(node->datum.u.xperms->perms.p,
|
||||||
xpermd->driver))
|
xpermd->driver))
|
||||||
return;
|
return;
|
||||||
} else {
|
break;
|
||||||
|
default:
|
||||||
BUG();
|
BUG();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (node->key.specified == AVTAB_XPERMS_ALLOWED) {
|
if (node->key.specified == AVTAB_XPERMS_ALLOWED) {
|
||||||
xpermd->used |= XPERMS_ALLOWED;
|
xpermd->used |= XPERMS_ALLOWED;
|
||||||
if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLDRIVER) {
|
update_xperms_extended_data(node->datum.u.xperms->specified,
|
||||||
memset(xpermd->allowed->p, 0xff,
|
&node->datum.u.xperms->perms,
|
||||||
sizeof(xpermd->allowed->p));
|
xpermd->allowed);
|
||||||
}
|
|
||||||
if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLFUNCTION) {
|
|
||||||
for (i = 0; i < ARRAY_SIZE(xpermd->allowed->p); i++)
|
|
||||||
xpermd->allowed->p[i] |=
|
|
||||||
node->datum.u.xperms->perms.p[i];
|
|
||||||
}
|
|
||||||
} else if (node->key.specified == AVTAB_XPERMS_AUDITALLOW) {
|
} else if (node->key.specified == AVTAB_XPERMS_AUDITALLOW) {
|
||||||
xpermd->used |= XPERMS_AUDITALLOW;
|
xpermd->used |= XPERMS_AUDITALLOW;
|
||||||
if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLDRIVER) {
|
update_xperms_extended_data(node->datum.u.xperms->specified,
|
||||||
memset(xpermd->auditallow->p, 0xff,
|
&node->datum.u.xperms->perms,
|
||||||
sizeof(xpermd->auditallow->p));
|
xpermd->auditallow);
|
||||||
}
|
|
||||||
if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLFUNCTION) {
|
|
||||||
for (i = 0; i < ARRAY_SIZE(xpermd->auditallow->p); i++)
|
|
||||||
xpermd->auditallow->p[i] |=
|
|
||||||
node->datum.u.xperms->perms.p[i];
|
|
||||||
}
|
|
||||||
} else if (node->key.specified == AVTAB_XPERMS_DONTAUDIT) {
|
} else if (node->key.specified == AVTAB_XPERMS_DONTAUDIT) {
|
||||||
xpermd->used |= XPERMS_DONTAUDIT;
|
xpermd->used |= XPERMS_DONTAUDIT;
|
||||||
if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLDRIVER) {
|
update_xperms_extended_data(node->datum.u.xperms->specified,
|
||||||
memset(xpermd->dontaudit->p, 0xff,
|
&node->datum.u.xperms->perms,
|
||||||
sizeof(xpermd->dontaudit->p));
|
xpermd->dontaudit);
|
||||||
}
|
|
||||||
if (node->datum.u.xperms->specified == AVTAB_XPERMS_IOCTLFUNCTION) {
|
|
||||||
for (i = 0; i < ARRAY_SIZE(xpermd->dontaudit->p); i++)
|
|
||||||
xpermd->dontaudit->p[i] |=
|
|
||||||
node->datum.u.xperms->perms.p[i];
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
BUG();
|
BUG();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue