Re: [PATCH] Fix expand logic for policy versions older than 24.

[Steve Lawrence <slawrence@tresys.com>]

I'm fine including it in 2.4.

I'm unclear on next versus master as well. Not sure what the original
intention was. I feel like there are not really that many incoming
patches (aside from the recent CIL changes) to really necessitate a
next/master branch split. And there's only one small patch on #next,
which I don't have a problem including in 2.4 as well--there's going to
be at least one more release candidate.

- Steve

On 11/25/2014 01:59 PM, Stephen Smalley wrote:
> 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.
>>
>>
>