The patch titled
Subject: kernel/audit: consolidate handling of mm->exe_file
has been added to the -mm tree. Its filename is
kernel-audit-consolidate-handling-of-mm-exe_file.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/kernel-audit-consolidate-handling-of-mm-exe_file.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/kernel-audit-consolidate-handling-of-mm-exe_file.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Davidlohr Bueso <dave@xxxxxxxxxxxx>
Subject: kernel/audit: consolidate handling of mm->exe_file
Add 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>
Cc: Paul Moore <paul@xxxxxxxxxxxxxx>
Cc: Eric Paris <eparis@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/audit.c | 23 +++++++++++++++--------
kernel/audit.h | 3 +++
kernel/auditsc.c | 9 +--------
3 files changed, 19 insertions(+), 16 deletions(-)
diff -puN kernel/audit.c~kernel-audit-consolidate-handling-of-mm-exe_file kernel/audit.c
--- a/kernel/audit.c~kernel-audit-consolidate-handling-of-mm-exe_file
+++ a/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_bu
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 -puN kernel/audit.h~kernel-audit-consolidate-handling-of-mm-exe_file kernel/audit.h
--- a/kernel/audit.h~kernel-audit-consolidate-handling-of-mm-exe_file
+++ a/kernel/audit.h
@@ -257,6 +257,9 @@ extern struct list_head audit_filter_lis
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 -puN kernel/auditsc.c~kernel-audit-consolidate-handling-of-mm-exe_file kernel/auditsc.c
--- a/kernel/auditsc.c~kernel-audit-consolidate-handling-of-mm-exe_file
+++ a/kernel/auditsc.c
@@ -2361,7 +2361,6 @@ static void audit_log_task(struct audit_
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_
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);
}
/**
_
Patches currently in -mm which might be from dave@xxxxxxxxxxxx are
kernel-audit-consolidate-handling-of-mm-exe_file.patch
kernel-audit-reduce-mmap_sem-hold-for-mm-exe_file.patch
arc-do-not-export-symbols-in-troubleshootc.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
