All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Cashman <dcashman@android.com>
To: selinux@tycho.nsa.gov
Cc: sds@tycho.nsa.gov, jwcart2@tycho.nsa.gov, jeffv@google.com,
	dcashman <dcashman@android.com>
Subject: [PATCH 2/5] libsepol: cil: Remove duplicate sid policy declaration.
Date: Thu,  8 Sep 2016 13:30:49 -0700	[thread overview]
Message-ID: <1473366652-23929-3-git-send-email-dcashman@android.com> (raw)
In-Reply-To: <1473366652-23929-2-git-send-email-dcashman@android.com>

From: dcashman <dcashman@android.com>

cil_gen_policy() creates two sets of sid declarations from CIL policy
due to the combination of sidorder iteration and the CIL_SID case in the
AST walk.  Remove the sidorder iteration.

Signed-off-by: Daniel Cashman <dcashman@android.com>
---
 libsepol/cil/src/cil_policy.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libsepol/cil/src/cil_policy.c b/libsepol/cil/src/cil_policy.c
index 324becc..d8ef151 100644
--- a/libsepol/cil/src/cil_policy.c
+++ b/libsepol/cil/src/cil_policy.c
@@ -1272,10 +1272,6 @@ int cil_gen_policy(struct cil_db *db)
 
 	policy_file = fopen("policy.conf", "w+");
 
-	cil_list_for_each(item, db->sidorder) {
-		fprintf(file_arr[ISIDS], "sid %s ", ((struct cil_sid*)item->data)->datum.name);
-	}
-
 	cil_list_for_each(item, db->classorder) {
 		struct cil_class *class = item->data;
 		struct cil_tree_node *node = class->datum.nodes->head->data;
-- 
2.8.0.rc3.226.g39d4020

  reply	other threads:[~2016-09-08 20:31 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-08 20:30 [PATCH 0/5] Fix some cil_gen_policy() bugs Daniel Cashman
2016-09-08 20:30 ` [PATCH 1/5] libsepol: cil: Add userrole mapping to cil_gen_policy() Daniel Cashman
2016-09-08 20:30   ` Daniel Cashman [this message]
2016-09-08 20:30     ` [PATCH 3/5] libsepol: cil: Replace sensitivityorder statement Daniel Cashman
2016-09-08 20:30       ` [PATCH 4/5] libsepol: cil: Fix CIL_OP data assignment Daniel Cashman
2016-09-08 20:30         ` [PATCH 5/5] libsepol: cil: Add cil_constraint_expr_to_policy() Daniel Cashman
2016-09-08 20:37 ` [PATCH 0/5] Fix some cil_gen_policy() bugs Daniel Cashman
2016-09-09 12:29   ` James Carter
2016-09-09 14:35     ` James Carter
2016-09-09 17:10       ` Daniel Cashman

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=1473366652-23929-3-git-send-email-dcashman@android.com \
    --to=dcashman@android.com \
    --cc=jeffv@google.com \
    --cc=jwcart2@tycho.nsa.gov \
    --cc=sds@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.