Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <83d32ac3-6633-3ccc-1377-91caaf709445@linux.ibm.com>
Date:   Mon, 31 Jan 2022 13:56:48 -0500
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.0
Subject: Re: [PATCH v9 16/23] ima: Implement ima_free_policy_rules() for
 freeing of an ima_namespace
Content-Language: en-US
To:     Mimi Zohar <zohar@linux.ibm.com>,
        Stefan Berger <stefanb@linux.vnet.ibm.com>,
        linux-integrity@vger.kernel.org
Cc:     serge@hallyn.com, christian.brauner@ubuntu.com,
        containers@lists.linux.dev, dmitry.kasatkin@gmail.com,
        ebiederm@xmission.com, krzysztof.struczynski@huawei.com,
        roberto.sassu@huawei.com, mpeters@redhat.com, lhinds@redhat.com,
        lsturman@redhat.com, puiterwi@redhat.com, jejb@linux.ibm.com,
        jamjoom@us.ibm.com, linux-kernel@vger.kernel.org,
        paul@paul-moore.com, rgb@redhat.com,
        linux-security-module@vger.kernel.org, jmorris@namei.org
References: <20220125224645.79319-1-stefanb@linux.vnet.ibm.com>
 <20220125224645.79319-17-stefanb@linux.vnet.ibm.com>
 <258c7c5e1aebfc9376560549794d43e744654713.camel@linux.ibm.com>
From:   Stefan Berger <stefanb@linux.ibm.com>
In-Reply-To: <258c7c5e1aebfc9376560549794d43e744654713.camel@linux.ibm.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 1/28/22 09:02, Mimi Zohar wrote:
> Hi Stefan,
>
> On Tue, 2022-01-25 at 17:46 -0500, Stefan Berger wrote:
>> From: Stefan Berger <stefanb@linux.ibm.com>
>>
>> Implement ima_free_policy_rules() that is needed when an ima_namespace
>> is freed.
>>
>> Only reset temp_ima_appraise when using init_ima_ns.
> Instead of having to walk the policy rules to know if there are any
> "appraise" rules, the ima_appraise flag is set.  For now, only reset
> temp_ima_appraise flag on failed policy rule updates for init_ima_ns.


Ok, I am taking this whole text.


>
>> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
>>
>> ---
>>   v9:
>>    - Only reset temp_ima_appraise when using init_ima_ns.
>> ---
>>   security/integrity/ima/ima.h        |  1 +
>>   security/integrity/ima/ima_policy.c | 20 +++++++++++++++++++-
>>   2 files changed, 20 insertions(+), 1 deletion(-)
>>
>> diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
>> index aea8fb8d2854..8c757223d549 100644
>> --- a/security/integrity/ima/ima.h
>> +++ b/security/integrity/ima/ima.h
>> @@ -329,6 +329,7 @@ void ima_update_policy_flags(struct ima_namespace *ns);
>>   ssize_t ima_parse_add_rule(struct ima_namespace *ns, char *rule);
>>   void ima_delete_rules(struct ima_namespace *ns);
>>   int ima_check_policy(struct ima_namespace *ns);
>> +void ima_free_policy_rules(struct ima_namespace *ns);
>>   void *ima_policy_start(struct seq_file *m, loff_t *pos);
>>   void *ima_policy_next(struct seq_file *m, void *v, loff_t *pos);
>>   void ima_policy_stop(struct seq_file *m, void *v);
>> diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
>> index e8140e73d80b..47f2d1b5d156 100644
>> --- a/security/integrity/ima/ima_policy.c
>> +++ b/security/integrity/ima/ima_policy.c
>> @@ -1880,13 +1880,31 @@ void ima_delete_rules(struct ima_namespace *ns)
>>   {
>>   	struct ima_rule_entry *entry, *tmp;
>>   
>> -	temp_ima_appraise = 0;
>> +	if (ns == &init_ima_ns)
>> +		temp_ima_appraise = 0;
>> +
>>   	list_for_each_entry_safe(entry, tmp, &ns->ima_temp_rules, list) {
>>   		list_del(&entry->list);
>>   		ima_free_rule(entry);
>>   	}
>>   }
>>   
>> +/**
>> + * ima_free_policy_rules - free all policy rules
>> + * @ns: IMA namespace that has the policy
>> + */
>> +void ima_free_policy_rules(struct ima_namespace *ns)
>> +{
>> +	struct ima_rule_entry *entry, *tmp;
>> +
>> +	ima_delete_rules(ns);
> When the IMA policy is being extended, new rules are temporarily added
> to the ima_temp_rules list.  If the entire set of rules being added are
> valid, they're appended to the tail.
>
> There shouldn't be any rules on the ima_temp_rules list unless the
> policy is currently being extended.  Is that possible at this point?

Actually, no. Nothing can be left. I am removing this call.

I wonder whether to split this patch into into two patches?


>
>> +
>> +	list_for_each_entry_safe(entry, tmp, &ns->ima_policy_rules, list) {
>> +		list_del(&entry->list);
>> +		ima_free_rule(entry);
>> +	}
>> +}
>> +
>>   #define __ima_hook_stringify(func, str)	(#func),
>>   
>>   const char *const func_tokens[] = {
> thanks,
>
> Mimi
>