[PATCH] apparmor: Simply obtain the newest label on a cred

[Serge E. Hallyn]

On Thu, Sep 22, 2022 at 11:00:24AM +0800, Gaosheng Cui wrote:
> aa_get_newest_cred_label(__task_cred(task)) can do the same things as
> aa_get_newest_label(__aa_task_raw_label(task)), so we can replace it
> and remove __aa_task_raw_label() to simply code.

nitpick -

"to simplify the code".

> 
> Signed-off-by: Gaosheng Cui <cuigaosheng1 at huawei.com>
> ---
>  security/apparmor/include/cred.h | 13 -------------
>  security/apparmor/task.c         |  2 +-
>  2 files changed, 1 insertion(+), 14 deletions(-)
> 
> diff --git a/security/apparmor/include/cred.h b/security/apparmor/include/cred.h
> index 0b9ae4804ef7..58fdc72af664 100644
> --- a/security/apparmor/include/cred.h
> +++ b/security/apparmor/include/cred.h
> @@ -63,19 +63,6 @@ static inline struct aa_label *aa_get_newest_cred_label(const struct cred *cred)
>  	return aa_get_newest_label(aa_cred_raw_label(cred));
>  }
>  
> -/**
> - * __aa_task_raw_label - retrieve another task's label
> - * @task: task to query  (NOT NULL)
> - *
> - * Returns: @task's label without incrementing its ref count
> - *
> - * If @task != current needs to be called in RCU safe critical section
> - */
> -static inline struct aa_label *__aa_task_raw_label(struct task_struct *task)
> -{
> -	return aa_cred_raw_label(__task_cred(task));
> -}
> -
>  /**
>   * aa_current_raw_label - find the current tasks confining label
>   *
> diff --git a/security/apparmor/task.c b/security/apparmor/task.c
> index 503dc0877fb1..0a8f9fa7ca0a 100644
> --- a/security/apparmor/task.c
> +++ b/security/apparmor/task.c
> @@ -31,7 +31,7 @@ struct aa_label *aa_get_task_label(struct task_struct *task)
>  	struct aa_label *p;
>  
>  	rcu_read_lock();
> -	p = aa_get_newest_label(__aa_task_raw_label(task));
> +	p = aa_get_newest_cred_label(__task_cred(task));
>  	rcu_read_unlock();
>  
>  	return p;
> -- 
> 2.25.1