From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from goalie.tycho.ncsc.mil (goalie [144.51.3.250]) by tarius.tycho.ncsc.mil (8.13.1/8.13.1) with ESMTP id p7T8Ox6k031401 for ; Mon, 29 Aug 2011 04:24:59 -0400 Received: from mail.windriver.com (localhost [127.0.0.1]) by msux-gh1-uea02.nsa.gov (8.12.10/8.12.10) with ESMTP id p7T8OwFQ015946 for ; Mon, 29 Aug 2011 08:24:58 GMT Message-ID: <4E5B4CD7.6020409@windriver.com> Date: Mon, 29 Aug 2011 16:24:55 +0800 From: Harry Ciao Reply-To: MIME-Version: 1.0 To: , CC: Subject: Re: [v1 PATCH 6/7] Skip tunable identifier and cond_node_t in expansion. References: <1314604432-12156-2-git-send-email-qingtao.cao@windriver.com> <1314604432-12156-6-git-send-email-qingtao.cao@windriver.com> In-Reply-To: <1314604432-12156-6-git-send-email-qingtao.cao@windriver.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Sender: owner-selinux@tycho.nsa.gov List-Id: selinux@tycho.nsa.gov Please ignore this patch, I would re-send it with 0/7 patch for extra comments for the v1 patchset. Sorry for any inconvenience! Thanks, Harry On 08/29/2011 03:53 PM, Harry Ciao wrote: > The effective branch of a tunable has been appended to its home > decl->avrules list during link, in expansion we should just skip tunables > from expanding their rules into te_cond_avtab hashtab and adding to the > out->cond_list queue. > > Signed-off-by: Harry Ciao > --- > libsepol/src/expand.c | 13 +++++++++++++ > 1 files changed, 13 insertions(+), 0 deletions(-) > > diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c > index be41243..d5f10a6 100644 > --- a/libsepol/src/expand.c > +++ b/libsepol/src/expand.c > @@ -1014,6 +1014,11 @@ static int bool_copy_callback(hashtab_key_t key, hashtab_datum_t datum, > return 0; > } > > + if (bool->flags& COND_BOOL_FLAGS_TUNABLE) { > + /* Skip tunables */ > + return 0; > + } > + > if (state->verbose) > INFO(state->handle, "copying boolean %s", id); > > @@ -1046,6 +1051,7 @@ static int bool_copy_callback(hashtab_key_t key, hashtab_datum_t datum, > state->boolmap[bool->s.value - 1] = new_bool->s.value; > > new_bool->state = bool->state; > + new_bool->flags = bool->flags; > > return 0; > } > @@ -1940,6 +1946,13 @@ static int cond_node_copy(expand_state_t * state, cond_node_t * cn) > if (cond_node_copy(state, cn->next)) { > return -1; > } > + > + /* If current cond_node_t is of tunable, its effective branch > + * has been appended to its home decl->avrules list during link > + * and now we should just skip it. */ > + if (cn->flags& COND_NODE_FLAGS_TUNABLE) > + return 0; > + > if (cond_normalize_expr(state->base, cn)) { > ERR(state->handle, "Error while normalizing conditional"); > return -1; -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with the words "unsubscribe selinux" without quotes as the message.