topjohnwu/selinux
1
0
Fork 0
mirror of https://github.com/topjohnwu/selinux.git synced 2024-12-02 16:46:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libsepol: Eliminate initial sid string definitions in module_to_cil.c

Browse Source 
Since the initial sid strings are defined in kernel_to_common.h,
module_to_cil.c can use those and its initial sid string definitions
can be removed.

Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
This commit is contained in:
James Carter 2018-10-11 08:35:47 -04:00 committed by William Roberts
parent 4cc016d033
commit a64649ba7b
1 changed files with 5 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libsepol/src/module_to_cil.c
View File

@ -52,6 +52,7 @@
#include <sepol/policydb/services.h>
#include <sepol/policydb/util.h>
#include "kernel_to_common.h"
#include "private.h"
#ifdef __GNUC__
@ -2546,7 +2547,8 @@ static int context_to_cil(struct policydb *pdb, struct context_struct *con)
return 0;
}
static int ocontext_isid_to_cil(struct policydb *pdb, const char **sid_to_string, struct ocontext *isids)
static int ocontext_isid_to_cil(struct policydb *pdb, const char *const *sid_to_string,
struct ocontext *isids)
{
int rc = -1;
@ -2602,41 +2604,7 @@ static int ocontext_selinux_isid_to_cil(struct policydb *pdb, struct ocontext *i
{
int rc = -1;
// initial sid names aren't actually stored in the pp files, need to a have
// a mapping, taken from the linux kernel
static const char *selinux_sid_to_string[] = {
"null",
"kernel",
"security",
"unlabeled",
"fs",
"file",
"file_labels",
"init",
"any_socket",
"port",
"netif",
"netmsg",
"node",
"igmp_packet",
"icmp_socket",
"tcp_socket",
"sysctl_modprobe",
"sysctl",
"sysctl_fs",
"sysctl_kernel",
"sysctl_net",
"sysctl_net_unix",
"sysctl_vm",
"sysctl_dev",
"kmod",
"policy",
"scmp_packet",
"devnull",
NULL
};
rc = ocontext_isid_to_cil(pdb, selinux_sid_to_string, isids);
rc = ocontext_isid_to_cil(pdb, selinux_sid_to_str, isids);
if (rc != 0) {
goto exit;
}
@ -2865,24 +2833,7 @@ static int ocontext_xen_isid_to_cil(struct policydb *pdb, struct ocontext *isids
{
int rc = -1;
// initial sid names aren't actually stored in the pp files, need to a have
// a mapping, taken from the xen kernel
static const char *xen_sid_to_string[] = {
"null",
"xen",
"dom0",
"domio",
"domxen",
"unlabeled",
"security",
"ioport",
"iomem",
"irq",
"device",
NULL,
};
rc = ocontext_isid_to_cil(pdb, xen_sid_to_string, isids);
rc = ocontext_isid_to_cil(pdb, xen_sid_to_str, isids);
if (rc != 0) {
goto exit;
}