Skip to contentSkip to conversation

checkpolicy: remove a redundant if-condition

PATCH Applied Masatake YAMATO 2 participants 4 messages Oct 19, 2019 – Oct 22, 2019 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 checkpolicy: remove a redundant if-condition

Inner if-condition in following code is redundant:

	if (outfile) {
		/* ... just referring outfile ... */
		if (outfile) {
			do_something();
		}
	}

We can simplify this to:

	if (outfile) {
		/* ... just referring outfile ... */
		do_something();
	}
---
 checkpolicy/checkpolicy.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
checkpolicy/checkpolicy.c +1 -3
index f928ec06..e18de171 100644
@@ -682,9 +682,7 @@ int main(int argc, char **argv)
 			}
 		}
 
-		if (outfile) {
-			fclose(outfp);
-		}
+		fclose(outfp);
 	} else if (cil) {
 		fprintf(stderr, "%s:  No file to write CIL was specified\n", argv[0]);
 		exit(1);
Signature · 1 line
2.21.0
#1 lore raw

PATCH v2 2/3 checkpolicy: update the description for -o option in the man page

Write about policy.conf and CIL files.

---
 checkpolicy/checkpolicy.8 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
checkpolicy/checkpolicy.8 +2 -1
index 1552f497..db57751c 100644
@@ -40,7 +40,8 @@ Enable the MLS policy when checking and compiling the policy.
 Specify the policy version, defaults to the latest.
 .TP
 .B \-o,\-\-output filename
-Write a binary policy file to the specified filename.
+Write a policy file (binary, policy.conf, or CIL policy)
+to the specified filename.
 .TP
 .B \-S,\-\-sort
 Sort ocontexts before writing out the binary policy. This option makes output of checkpolicy consistent with binary policies created by semanage and secilc.
Signature · 1 line
2.21.0
#2 lore raw

PATCH v2 3/3 checkpolicy: allow to write policy to stdout

In reply to Masatake YAMATO

If - is given as filename for -o option, checkpolicy writes the policy to standard output. This helps users to read policy.conf and/or CIL policy file with pager like less command:

 $ checkpolicy -M -F -b /sys/fs/selinux/policy  -o - | less

The users don't have to make a temporary file. /dev/stdout can be used instead. However, - reduces the number of typing for the purpose. Using - for standard output (and/or standard input) is popular convention.

Change(s) in v2:
* Check the availability of output stream only when opening a regualar file. Suggested by Stephen Smalley <[email protected]>.

---
 checkpolicy/checkpolicy.8 |  5 +++--
 checkpolicy/checkpolicy.c | 22 +++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)
checkpolicy/checkpolicy.8 +3 -2
index db57751c..bdfd6acd 100644
@@ -3,7 +3,7 @@
 checkpolicy \- SELinux policy compiler
 .SH SYNOPSIS
 .B checkpolicy
-.I "[\-b[F]] [\-C] [\-d] [\-U handle_unknown (allow,deny,reject)] [\-M] [\-c policyvers] [\-o output_file] [\-S] [\-t target_platform (selinux,xen)] [\-V] [input_file]"
+.I "[\-b[F]] [\-C] [\-d] [\-U handle_unknown (allow,deny,reject)] [\-M] [\-c policyvers] [\-o output_file|\-] [\-S] [\-t target_platform (selinux,xen)] [\-V] [input_file]"
 .br
 .SH "DESCRIPTION"
 This manual page describes the
@@ -41,7 +41,8 @@ Specify the policy version, defaults to the latest.
 .TP
 .B \-o,\-\-output filename
 Write a policy file (binary, policy.conf, or CIL policy)
-to the specified filename.
+to the specified filename. If - is given as filename,
+write it to standard output.
 .TP
 .B \-S,\-\-sort
 Sort ocontexts before writing out the binary policy. This option makes output of checkpolicy consistent with binary policies created by semanage and secilc.
checkpolicy/checkpolicy.c +15 -7
index e18de171..7c5b63f8 100644
@@ -112,7 +112,7 @@ static __attribute__((__noreturn__)) void usage(const char *progname)
 {
 	printf
 	    ("usage:  %s [-b[F]] [-C] [-d] [-U handle_unknown (allow,deny,reject)] [-M] "
-	     "[-c policyvers (%d-%d)] [-o output_file] [-S] "
+	     "[-c policyvers (%d-%d)] [-o output_file|-] [-S] "
 	     "[-t target_platform (selinux,xen)] [-V] [input_file]\n",
 	     progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX);
 	exit(1);
@@ -390,7 +390,8 @@ int main(int argc, char **argv)
 	struct sepol_av_decision avd;
 	class_datum_t *cladatum;
 	const char *file = txtfile;
-	char ans[80 + 1], *outfile = NULL, *path, *fstype;
+	char ans[80 + 1], *path, *fstype;
+	const char *outfile = NULL;
 	size_t scontext_len, pathlen;
 	unsigned int i;
 	unsigned int protocol, port;
@@ -638,10 +639,15 @@ int main(int argc, char **argv)
 	}
 
 	if (outfile) {
-		outfp = fopen(outfile, "w");
-		if (!outfp) {
-			perror(outfile);
-			exit(1);
+		if (!strcmp(outfile, "-")) {
+			outfp = stdout;
+			outfile = "<STDOUT>";
+		} else {
+			outfp = fopen(outfile, "w");
+			if (!outfp) {
+				perror(outfile);
+				exit(1);
+			}
 		}
 
 		policydb.policyvers = policyvers;
@@ -682,7 +688,9 @@ int main(int argc, char **argv)
 			}
 		}
 
-		fclose(outfp);
+		if (outfp != stdout) {
+			fclose(outfp);
+		}
 	} else if (cil) {
 		fprintf(stderr, "%s:  No file to write CIL was specified\n", argv[0]);
 		exit(1);
Signature · 1 line
2.21.0
#3 lore raw

Re: [PATCH v2 3/3] checkpolicy: allow to write policy to stdout

Quoted 12 lines · Masatake YAMATO

If - is given as filename for -o option, checkpolicy writes the policy to standard output. This helps users to read policy.conf and/or CIL policy file with pager like less command:

  $ checkpolicy -M -F -b /sys/fs/selinux/policy  -o - | less

The users don't have to make a temporary file. /dev/stdout can be used instead. However, - reduces the number of typing for the purpose. Using - for standard output (and/or standard input) is popular convention.

Quoted 5 lines

Change(s) in v2:
* Check the availability of output stream only when opening a regualar file. Suggested by Stephen Smalley <[email protected]>.

Thanks, applied.

Quoted 83 lines
---
  checkpolicy/checkpolicy.8 |  5 +++--
  checkpolicy/checkpolicy.c | 22 +++++++++++++++-------
  2 files changed, 18 insertions(+), 9 deletions(-)
checkpolicy/checkpolicy.8 +3 -2
index db57751c..bdfd6acd 100644
@@ -3,7 +3,7 @@
  checkpolicy \- SELinux policy compiler
  .SH SYNOPSIS
  .B checkpolicy
-.I "[\-b[F]] [\-C] [\-d] [\-U handle_unknown (allow,deny,reject)] [\-M] [\-c policyvers] [\-o output_file] [\-S] [\-t target_platform (selinux,xen)] [\-V] [input_file]"
+.I "[\-b[F]] [\-C] [\-d] [\-U handle_unknown (allow,deny,reject)] [\-M] [\-c policyvers] [\-o output_file|\-] [\-S] [\-t target_platform (selinux,xen)] [\-V] [input_file]"
  .br
  .SH "DESCRIPTION"
  This manual page describes the
@@ -41,7 +41,8 @@ Specify the policy version, defaults to the latest.
  .TP
  .B \-o,\-\-output filename
  Write a policy file (binary, policy.conf, or CIL policy)
-to the specified filename.
+to the specified filename. If - is given as filename,
+write it to standard output.
  .TP
  .B \-S,\-\-sort
  Sort ocontexts before writing out the binary policy. This option makes output of checkpolicy consistent with binary policies created by semanage and secilc.
checkpolicy/checkpolicy.c +15 -7
index e18de171..7c5b63f8 100644
@@ -112,7 +112,7 @@ static __attribute__((__noreturn__)) void usage(const char *progname)
  {
  	printf
  	    ("usage:  %s [-b[F]] [-C] [-d] [-U handle_unknown (allow,deny,reject)] [-M] "
-	     "[-c policyvers (%d-%d)] [-o output_file] [-S] "
+	     "[-c policyvers (%d-%d)] [-o output_file|-] [-S] "
  	     "[-t target_platform (selinux,xen)] [-V] [input_file]\n",
  	     progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX);
  	exit(1);
@@ -390,7 +390,8 @@ int main(int argc, char **argv)
  	struct sepol_av_decision avd;
  	class_datum_t *cladatum;
  	const char *file = txtfile;
-	char ans[80 + 1], *outfile = NULL, *path, *fstype;
+	char ans[80 + 1], *path, *fstype;
+	const char *outfile = NULL;
  	size_t scontext_len, pathlen;
  	unsigned int i;
  	unsigned int protocol, port;
@@ -638,10 +639,15 @@ int main(int argc, char **argv)
  	}
 
  	if (outfile) {
-		outfp = fopen(outfile, "w");
-		if (!outfp) {
-			perror(outfile);
-			exit(1);
+		if (!strcmp(outfile, "-")) {
+			outfp = stdout;
+			outfile = "<STDOUT>";
+		} else {
+			outfp = fopen(outfile, "w");
+			if (!outfp) {
+				perror(outfile);
+				exit(1);
+			}
  		}
 
  		policydb.policyvers = policyvers;
@@ -682,7 +688,9 @@ int main(int argc, char **argv)
  			}
  		}
 
-		fclose(outfp);
+		if (outfp != stdout) {
+			fclose(outfp);
+		}
  	} else if (cil) {
  		fprintf(stderr, "%s:  No file to write CIL was specified\n", argv[0]);
  		exit(1);