Re: [PATCH v2 1/3] kernel/audit: consolidate handling of mm->exe_file

[Paul Moore]

On Sunday, February 22, 2015 06:20:00 PM Davidlohr Bueso wrote:
> This patch adds a audit_log_d_path_exe() helper function
> to share how we handle auditing of the exe_file's path.
> Used by both audit and auditsc. No functionality is changed.
> 
> Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
> ---
> 
> changes from v1: created normal function for helper.
> 
>  kernel/audit.c   | 23 +++++++++++++++--------
>  kernel/audit.h   |  3 +++
>  kernel/auditsc.c |  9 +--------
>  3 files changed, 19 insertions(+), 16 deletions(-)

Merged into audit#next.

> diff --git a/kernel/audit.c b/kernel/audit.c
> index 72ab759..a71cbfe 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -1838,11 +1838,24 @@ error_path:
>  }
>  EXPORT_SYMBOL(audit_log_task_context);
> 
> +void audit_log_d_path_exe(struct audit_buffer *ab,
> +			  struct mm_struct *mm)
> +{
> +	if (!mm) {
> +		audit_log_format(ab, " exe=(null)");
> +		return;
> +	}
> +
> +	down_read(&mm->mmap_sem);
> +	if (mm->exe_file)
> +		audit_log_d_path(ab, " exe=", &mm->exe_file->f_path);
> +	up_read(&mm->mmap_sem);
> +}
> +
>  void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk)
>  {
>  	const struct cred *cred;
>  	char comm[sizeof(tsk->comm)];
> -	struct mm_struct *mm = tsk->mm;
>  	char *tty;
> 
>  	if (!ab)
> @@ -1878,13 +1891,7 @@ void audit_log_task_info(struct audit_buffer *ab,
> struct task_struct *tsk) audit_log_format(ab, " comm=");
>  	audit_log_untrustedstring(ab, get_task_comm(comm, tsk));
> 
> -	if (mm) {
> -		down_read(&mm->mmap_sem);
> -		if (mm->exe_file)
> -			audit_log_d_path(ab, " exe=", &mm->exe_file->f_path);
> -		up_read(&mm->mmap_sem);
> -	} else
> -		audit_log_format(ab, " exe=(null)");
> +	audit_log_d_path_exe(ab, tsk->mm);
>  	audit_log_task_context(ab);
>  }
>  EXPORT_SYMBOL(audit_log_task_info);
> diff --git a/kernel/audit.h b/kernel/audit.h
> index 1caa0d3..d641f9b 100644
> --- a/kernel/audit.h
> +++ b/kernel/audit.h
> @@ -257,6 +257,9 @@ extern struct list_head audit_filter_list[];
> 
>  extern struct audit_entry *audit_dupe_rule(struct audit_krule *old);
> 
> +extern void audit_log_d_path_exe(struct audit_buffer *ab,
> +				 struct mm_struct *mm);
> +
>  /* audit watch functions */
>  #ifdef CONFIG_AUDIT_WATCH
>  extern void audit_put_watch(struct audit_watch *watch);
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index dc4ae70..84c74d0 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -2361,7 +2361,6 @@ static void audit_log_task(struct audit_buffer *ab)
>  	kuid_t auid, uid;
>  	kgid_t gid;
>  	unsigned int sessionid;
> -	struct mm_struct *mm = current->mm;
>  	char comm[sizeof(current->comm)];
> 
>  	auid = audit_get_loginuid(current);
> @@ -2376,13 +2375,7 @@ static void audit_log_task(struct audit_buffer *ab)
>  	audit_log_task_context(ab);
>  	audit_log_format(ab, " pid=%d comm=", task_pid_nr(current));
>  	audit_log_untrustedstring(ab, get_task_comm(comm, current));
> -	if (mm) {
> -		down_read(&mm->mmap_sem);
> -		if (mm->exe_file)
> -			audit_log_d_path(ab, " exe=", &mm->exe_file->f_path);
> -		up_read(&mm->mmap_sem);
> -	} else
> -		audit_log_format(ab, " exe=(null)");
> +	audit_log_d_path_exe(ab, current->mm);
>  }
> 
>  /**

-- 
paul moore
www.paul-moore.com

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/