From: Stephen Smalley <sds@tycho.nsa.gov>
To: Steve Lawrence <slawrence@tresys.com>, selinux@tycho.nsa.gov
Subject: Re: [PATCH] Fix expand logic for policy versions older than 24.
Date: Tue, 25 Nov 2014 13:59:11 -0500 [thread overview]
Message-ID: <5474D17F.5060008@tycho.nsa.gov> (raw)
In-Reply-To: <54735BC4.7050207@tresys.com>
Will this be included in libsepol 2.4? It is a bug fix. Not clear on
current state of master versus next branches; master libsepol/VERSION is
2.4-rc6 but does not include this or my prior libsepol patch; next
libsepol/VERSION is only 2.4-rc4 but does include them.
On 11/24/2014 11:24 AM, Steve Lawrence wrote:
> Acked-By: Steve Lawrence <slawrence@tresys.com>
>
> On 11/24/2014 10:06 AM, Stephen Smalley wrote:
>> This was broken for older policy versions when we updated to
>> version 24.
>>
>> Broken by commit 787f2f00f5d8ed6f5f.
>>
>> Change-Id: I4063334c5c0462ef5c3706611c7dff5c60c612aa
>> Reported-by: William Roberts <bill.c.roberts@gmail.com>
>> Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
>> ---
>> libsepol/src/expand.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
>> index 23eb6ed..57293ae 100644
>> --- a/libsepol/src/expand.c
>> +++ b/libsepol/src/expand.c
>> @@ -3159,12 +3159,12 @@ static int expand_avtab_node(avtab_key_t * k, avtab_datum_t * d, void *args)
>> newkey.target_class = k->target_class;
>> newkey.specified = k->specified;
>>
>> - if (stype->flavor != TYPE_ATTRIB && ttype->flavor != TYPE_ATTRIB) {
>> + if (stype && ttype && stype->flavor != TYPE_ATTRIB && ttype->flavor != TYPE_ATTRIB) {
>> /* Both are individual types, no expansion required. */
>> return expand_avtab_insert(expa, k, d);
>> }
>>
>> - if (stype->flavor != TYPE_ATTRIB) {
>> + if (stype && stype->flavor != TYPE_ATTRIB) {
>> /* Source is an individual type, target is an attribute. */
>> newkey.source_type = k->source_type;
>> ebitmap_for_each_bit(tattr, tnode, j) {
>> @@ -3178,7 +3178,7 @@ static int expand_avtab_node(avtab_key_t * k, avtab_datum_t * d, void *args)
>> return 0;
>> }
>>
>> - if (ttype->flavor != TYPE_ATTRIB) {
>> + if (ttype && ttype->flavor != TYPE_ATTRIB) {
>> /* Target is an individual type, source is an attribute. */
>> newkey.target_type = k->target_type;
>> ebitmap_for_each_bit(sattr, snode, i) {
>> @@ -3289,12 +3289,12 @@ int expand_cond_av_node(policydb_t * p,
>> newkey.target_class = k->target_class;
>> newkey.specified = k->specified;
>>
>> - if (stype->flavor != TYPE_ATTRIB && ttype->flavor != TYPE_ATTRIB) {
>> + if (stype && ttype && stype->flavor != TYPE_ATTRIB && ttype->flavor != TYPE_ATTRIB) {
>> /* Both are individual types, no expansion required. */
>> return expand_cond_insert(newl, expa, k, d);
>> }
>>
>> - if (stype->flavor != TYPE_ATTRIB) {
>> + if (stype && stype->flavor != TYPE_ATTRIB) {
>> /* Source is an individual type, target is an attribute. */
>> newkey.source_type = k->source_type;
>> ebitmap_for_each_bit(tattr, tnode, j) {
>> @@ -3308,7 +3308,7 @@ int expand_cond_av_node(policydb_t * p,
>> return 0;
>> }
>>
>> - if (ttype->flavor != TYPE_ATTRIB) {
>> + if (ttype && ttype->flavor != TYPE_ATTRIB) {
>> /* Target is an individual type, source is an attribute. */
>> newkey.target_type = k->target_type;
>> ebitmap_for_each_bit(sattr, snode, i) {
>>
>
> _______________________________________________
> Selinux mailing list
> Selinux@tycho.nsa.gov
> To unsubscribe, send email to Selinux-leave@tycho.nsa.gov.
> To get help, send an email containing "help" to Selinux-request@tycho.nsa.gov.
>
>
next prev parent reply other threads:[~2014-11-25 18:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-24 15:06 [PATCH] Fix expand logic for policy versions older than 24 Stephen Smalley
2014-11-24 16:24 ` Steve Lawrence
2014-11-25 18:59 ` Stephen Smalley [this message]
2014-12-01 15:45 ` Steve Lawrence
2014-12-03 14:50 ` Stephen Smalley
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=5474D17F.5060008@tycho.nsa.gov \
--to=sds@tycho.nsa.gov \
--cc=selinux@tycho.nsa.gov \
--cc=slawrence@tresys.com \
/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.