RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

checkpolicy: misc checkmodule tweaks 

Add missing argument in usage message.
Drop redundant includes `optarg` and `optind`, which are declared in
<getopt.h>.
Use consistent quit style by using `exit(1)`.
Mark read-only options struct const.
Check closing file streams after writing, which can signal a failed
write or sync to disk and should be checked.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
This commit is contained in:
Christian Göttsche 2021-09-14 14:48:19 +02:00 committed by James Carter
parent 5570c2e394
commit 9696bb5449
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
checkpolicy/checkmodule.c
View File

@ -34,9 +34,6 @@
#include "checkpolicy.h" #include "checkpolicy.h"
#include "parse_util.h" #include "parse_util.h"
extern char *optarg;
extern int optind;
static sidtab_t sidtab; static sidtab_t sidtab;
extern int mlspol; extern int mlspol;
@ -126,7 +123,7 @@ static int write_binary_policy(policydb_t * p, FILE *outfp)
static __attribute__((__noreturn__)) void usage(const char *progname) static __attribute__((__noreturn__)) void usage(const char *progname)
{ {
printf("usage: %s [-h] [-V] [-b] [-C] [-E] [-U handle_unknown] [-m] [-M] [-o FILE] [INPUT]\n", progname); printf("usage: %s [-h] [-V] [-b] [-C] [-E] [-U handle_unknown] [-m] [-M] [-o FILE] [-c VERSION] [INPUT]\n", progname);
printf("Build base and policy modules.\n"); printf("Build base and policy modules.\n");
printf("Options:\n"); printf("Options:\n");
printf(" INPUT build module from INPUT (else read from \"%s\")\n", printf(" INPUT build module from INPUT (else read from \"%s\")\n",
@ -155,7 +152,7 @@ int main(int argc, char **argv)
int ch; int ch;
int show_version = 0; int show_version = 0;
policydb_t modpolicydb; policydb_t modpolicydb;
struct option long_options[] = { const struct option long_options[] = {
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"output", required_argument, NULL, 'o'}, {"output", required_argument, NULL, 'o'},
{"binary", no_argument, NULL, 'b'}, {"binary", no_argument, NULL, 'b'},
@ -271,7 +268,7 @@ int main(int argc, char **argv)
} else { } else {
if (policydb_init(&modpolicydb)) { if (policydb_init(&modpolicydb)) {
fprintf(stderr, "%s: out of memory!\n", argv[0]); fprintf(stderr, "%s: out of memory!\n", argv[0]);
return -1; exit(1);
} }
modpolicydb.policy_type = policy_type; modpolicydb.policy_type = policy_type;
@ -283,7 +280,7 @@ int main(int argc, char **argv)
} }
if (hierarchy_check_constraints(NULL, &modpolicydb)) { if (hierarchy_check_constraints(NULL, &modpolicydb)) {
return -1; exit(1);
} }
} }
@ -336,7 +333,7 @@ int main(int argc, char **argv)
FILE *outfp = fopen(outfile, "w"); FILE *outfp = fopen(outfile, "w");
if (!outfp) { if (!outfp) {
perror(outfile); fprintf(stderr, "%s: error opening %s: %s\n", argv[0], outfile, strerror(errno));
exit(1); exit(1);
} }
@ -352,7 +349,10 @@ int main(int argc, char **argv)
} }
} }
fclose(outfp); if (fclose(outfp)) {
fprintf(stderr, "%s: error closing %s: %s\n", argv[0], outfile, strerror(errno));
exit(1);
}
} else if (cil) { } else if (cil) {
fprintf(stderr, "%s: No file to write CIL was specified\n", argv[0]); fprintf(stderr, "%s: No file to write CIL was specified\n", argv[0]);
exit(1); exit(1);