RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-26 16:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

policycoreutils/hll/pp: Warn if module name different than output filename

Browse Source 
Since CIL treats files as modules and does not have a separate
module statement it can cause confusion when a Refpolicy module
has a name that is not the same as its base filename because older
SELinux userspaces will refer to the module by its module name while
a CIL-based userspace will refer to it by its filename.

Because of this, provide a warning message when converting a policy
package to CIL and the output filename is different than the module
name.

Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
This commit is contained in:
James Carter 2016-04-06 13:38:24 -04:00
parent 5e522da5df
commit 8fb088a33d
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
policycoreutils/hll/pp/pp.c
View File

@ -28,6 +28,7 @@
#include <sepol/module.h>
#include <sepol/module_to_cil.h>
#include <sepol/policydb/module.h>
char *progname;
@ -68,6 +69,8 @@ int main(int argc, char **argv)
{ NULL, 0, NULL, 0 }
};
struct sepol_module_package *mod_pkg = NULL;
char *ifile = NULL;
char *ofile = NULL;
FILE *in = NULL;
FILE *out = NULL;
int outfd = -1;
@ -89,20 +92,23 @@ int main(int argc, char **argv)
}
if (argc >= optind + 1 && strcmp(argv[1], "-") != 0) {
in = fopen(argv[1], "rb");
ifile = argv[1];
in = fopen(ifile, "rb");
if (in == NULL) {
log_err("Failed to open %s: %s", argv[1], strerror(errno));
log_err("Failed to open %s: %s", ifile, strerror(errno));
rc = -1;
goto exit;
}
} else {
ifile = "stdin";
in = stdin;
}
if (argc >= optind + 2 && strcmp(argv[2], "-") != 0) {
out = fopen(argv[2], "w");
ofile = argv[2];
out = fopen(ofile, "w");
if (out == NULL) {
log_err("Failed to open %s: %s", argv[2], strerror(errno));
log_err("Failed to open %s: %s", ofile, strerror(errno));
rc = -1;
goto exit;
}
@ -122,6 +128,25 @@ int main(int argc, char **argv)
fclose(in);
in = NULL;
if (ofile) {
char *mod_name = mod_pkg->policy->p.name;
char *cil_path = strdup(ofile);
if (cil_path == NULL) {
log_err("No memory available for strdup\n");
rc = -1;
goto exit;
}
char *cil_name = basename(cil_path);
char *separator = strrchr(cil_name, '.');
if (separator) {
*separator = '\0';
}
if (strcmp(mod_name, cil_name) != 0) {
fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than %s\n", ifile, cil_name, mod_name);
}
free(cil_path);
}
rc = sepol_module_package_to_cil(out, mod_pkg);
if (rc != 0) {
goto exit;