policycoreutils/hll/pp: Fix pp crash when processing base module

Commit Message

Vit Mojzis Jan. 19, 2017, 10:34 a.m. UTC

Policy module structure created by libsepol out of base module
contains NULL in module name, which results in segfault in "pp"
compiler. Add NULL check.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1350806

Signed-off-by: Vit Mojzis <[e-mail]>
---
 policycoreutils/hll/pp/pp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stephen Smalley Jan. 19, 2017, 5:32 p.m. UTC | #1

On Thu, 2017-01-19 at 11:34 +0100, Vit Mojzis wrote:
> Policy module structure created by libsepol out of base module
> contains NULL in module name, which results in segfault in "pp"
> compiler. Add NULL check.
> 
> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1350806

Thanks, applied.

> 
> Signed-off-by: Vit Mojzis <[e-mail]>
> ---
>  policycoreutils/hll/pp/pp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/policycoreutils/hll/pp/pp.c
> b/policycoreutils/hll/pp/pp.c
> index 2c9f53f..7f9afb0 100644
> --- a/policycoreutils/hll/pp/pp.c
> +++ b/policycoreutils/hll/pp/pp.c
> @@ -141,7 +141,7 @@ int main(int argc, char **argv)
>  		if (separator) {
>  			*separator = '\0';
>  		}
> -		if (strcmp(mod_name, cil_name) != 0) {
> +		if (mod_name && 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, mod_name, cil_name);
>  		}
>  		free(cil_path);

Patch

diff --git a/policycoreutils/hll/pp/pp.c b/policycoreutils/hll/pp/pp.c
index 2c9f53f..7f9afb0 100644
--- a/policycoreutils/hll/pp/pp.c
+++ b/policycoreutils/hll/pp/pp.c
@@ -141,7 +141,7 @@  int main(int argc, char **argv)
 		if (separator) {
 			*separator = '\0';
 		}
-		if (strcmp(mod_name, cil_name) != 0) {
+		if (mod_name && 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, mod_name, cil_name);
 		}
 		free(cil_path);