Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <81053742-0abf-1814-1077-b8c974623797@canonical.com>
Date:   Tue, 17 Jan 2023 22:45:32 -0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.2
Subject: Re: [apparmor] [PATCH] apparmor: make aa_set_current_onexec return
 void
Content-Language: en-US
To:     Tyler Hicks <code@tyhicks.com>, Quanfa Fu <quanfafu@gmail.com>
Cc:     paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com,
        linux-security-module@vger.kernel.org, apparmor@lists.ubuntu.com,
        linux-kernel@vger.kernel.org
References: <20230114164952.232653-1-quanfafu@gmail.com>
 <Y8dyfZIAhFfIvVBn@sequoia>
From:   John Johansen <john.johansen@canonical.com>
Organization: Canonical
In-Reply-To: <Y8dyfZIAhFfIvVBn@sequoia>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 1/17/23 20:15, Tyler Hicks wrote:
> On 2023-01-15 00:49:52, Quanfa Fu wrote:
>> Change the return type to void since it always return 0, and no need
>> to do the checking in aa_set_current_onexec.
>>
>> Signed-off-by: Quanfa Fu <quanfafu@gmail.com>
> 
> This looks like a safe change to me. There's nothing to error check
> within aa_set_current_onexec() so returning void is fine.
> 
>    Reviewed-by: "Tyler Hicks (Microsoft)" <code@tyhicks.com>
> 

Looks good, I have pulled this into my tree

Acked-by: John Johansen <john.johansen@canonical.com>

> Tyler
> 
>> ---
>>   security/apparmor/domain.c       | 2 +-
>>   security/apparmor/include/task.h | 2 +-
>>   security/apparmor/task.c         | 5 +----
>>   3 files changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
>> index 6dd3cc5309bf..bbc9c8a87b8e 100644
>> --- a/security/apparmor/domain.c
>> +++ b/security/apparmor/domain.c
>> @@ -1446,7 +1446,7 @@ int aa_change_profile(const char *fqname, int flags)
>>   		}
>>   
>>   		/* full transition will be built in exec path */
>> -		error = aa_set_current_onexec(target, stack);
>> +		aa_set_current_onexec(target, stack);
>>   	}
>>   
>>   audit:
>> diff --git a/security/apparmor/include/task.h b/security/apparmor/include/task.h
>> index 13437d62c70f..01717fe432c3 100644
>> --- a/security/apparmor/include/task.h
>> +++ b/security/apparmor/include/task.h
>> @@ -30,7 +30,7 @@ struct aa_task_ctx {
>>   };
>>   
>>   int aa_replace_current_label(struct aa_label *label);
>> -int aa_set_current_onexec(struct aa_label *label, bool stack);
>> +void aa_set_current_onexec(struct aa_label *label, bool stack);
>>   int aa_set_current_hat(struct aa_label *label, u64 token);
>>   int aa_restore_previous_label(u64 cookie);
>>   struct aa_label *aa_get_task_label(struct task_struct *task);
>> diff --git a/security/apparmor/task.c b/security/apparmor/task.c
>> index 84d16a29bfcb..5671a716fcd2 100644
>> --- a/security/apparmor/task.c
>> +++ b/security/apparmor/task.c
>> @@ -93,9 +93,8 @@ int aa_replace_current_label(struct aa_label *label)
>>    * aa_set_current_onexec - set the tasks change_profile to happen onexec
>>    * @label: system label to set at exec  (MAYBE NULL to clear value)
>>    * @stack: whether stacking should be done
>> - * Returns: 0 or error on failure
>>    */
>> -int aa_set_current_onexec(struct aa_label *label, bool stack)
>> +void aa_set_current_onexec(struct aa_label *label, bool stack)
>>   {
>>   	struct aa_task_ctx *ctx = task_ctx(current);
>>   
>> @@ -103,8 +102,6 @@ int aa_set_current_onexec(struct aa_label *label, bool stack)
>>   	aa_put_label(ctx->onexec);
>>   	ctx->onexec = label;
>>   	ctx->token = stack;
>> -
>> -	return 0;
>>   }
>>   
>>   /**
>> -- 
>> 2.31.1
>>
>>