From: Daniel J Walsh <dwalsh@redhat.com>
To: James Carter <jwcart2@tycho.nsa.gov>, selinux@tycho.nsa.gov
Subject: Re: [PATCH 2/2 v2] checkpolicy: Warn if module name different than output filename
Date: Thu, 7 Apr 2016 11:28:19 -0400 [thread overview]
Message-ID: <57067C93.3040000@redhat.com> (raw)
In-Reply-To: <1460041566-7173-3-git-send-email-jwcart2@tycho.nsa.gov>
On 04/07/2016 11:06 AM, James Carter wrote:
> 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 different than 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 compiling a module and
> the output filename is different than the module name.
>
> Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
> ---
> checkpolicy/checkmodule.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/checkpolicy/checkmodule.c b/checkpolicy/checkmodule.c
> index 5957d29..d807620 100644
> --- a/checkpolicy/checkmodule.c
> +++ b/checkpolicy/checkmodule.c
> @@ -19,6 +19,7 @@
> #include <stdio.h>
> #include <errno.h>
> #include <sys/mman.h>
> +#include <libgen.h>
>
> #include <sepol/module_to_cil.h>
> #include <sepol/policydb/policydb.h>
> @@ -258,6 +259,20 @@ int main(int argc, char **argv)
> }
> }
>
> + if (policy_type != POLICY_BASE && outfile) {
> + char *mod_name = modpolicydb.name;
> + char *out_path = strdup(outfile);
> + char *out_name = basename(out_path);
> + char *separator = strrchr(out_name, '.');
> + if (separator) {
> + *separator = '\0';
> + }
> + if (strcmp(mod_name, out_name) != 0) {
> + fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than as %s\n", file, out_name, mod_name);
> + }
> + free(out_path);
> + }
> +
> if (modpolicydb.policy_type == POLICY_BASE && !cil) {
> /* Verify that we can successfully expand the base module. */
> policydb_t kernpolicydb;
Why not fail rather then warn. Don't let me do stupid things...
next prev parent reply other threads:[~2016-04-07 15:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 15:06 [PATCH 0/2 v2] Warn if module name different than output filename James Carter
2016-04-07 15:06 ` [PATCH 1/2 v2] policycoreutils/hll/pp: " James Carter
2016-04-07 16:41 ` Thomas Hurd
2016-04-07 18:04 ` James Carter
2016-04-07 15:06 ` [PATCH 2/2 v2] checkpolicy: " James Carter
2016-04-07 15:28 ` Daniel J Walsh [this message]
2016-04-07 19:34 ` James Carter
2016-04-07 19:45 ` Daniel J Walsh
2016-04-08 8:25 ` [PATCH 0/2 v2] " Petr Lautrbach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57067C93.3040000@redhat.com \
--to=dwalsh@redhat.com \
--cc=jwcart2@tycho.nsa.gov \
--cc=selinux@tycho.nsa.gov \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.