aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlabel/netlabel_user.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/netlabel/netlabel_user.c')
-rw-r--r--net/netlabel/netlabel_user.c66
1 files changed, 8 insertions, 58 deletions
diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c
index c2343af..98a4163 100644
--- a/net/netlabel/netlabel_user.c
+++ b/net/netlabel/netlabel_user.c
@@ -85,7 +85,7 @@ int netlbl_netlink_init(void)
/**
* netlbl_audit_start_common - Start an audit message
* @type: audit message type
- * @secid: LSM context ID
+ * @audit_info: NetLabel audit information
*
* Description:
* Start an audit message using the type specified in @type and fill the audit
@@ -93,14 +93,11 @@ int netlbl_netlink_init(void)
* a pointer to the audit buffer on success, NULL on failure.
*
*/
-struct audit_buffer *netlbl_audit_start_common(int type, u32 secid)
+struct audit_buffer *netlbl_audit_start_common(int type,
+ struct netlbl_audit *audit_info)
{
struct audit_context *audit_ctx = current->audit_context;
struct audit_buffer *audit_buf;
- uid_t audit_loginuid;
- const char *audit_tty;
- char audit_comm[sizeof(current->comm)];
- struct vm_area_struct *vma;
char *secctx;
u32 secctx_len;
@@ -108,60 +105,13 @@ struct audit_buffer *netlbl_audit_start_common(int type, u32 secid)
if (audit_buf == NULL)
return NULL;
- audit_loginuid = audit_get_loginuid(audit_ctx);
- if (current->signal &&
- current->signal->tty &&
- current->signal->tty->name)
- audit_tty = current->signal->tty->name;
- else
- audit_tty = "(none)";
- get_task_comm(audit_comm, current);
+ audit_log_format(audit_buf, "netlabel: auid=%u", audit_info->loginuid);
- audit_log_format(audit_buf,
- "netlabel: auid=%u uid=%u tty=%s pid=%d",
- audit_loginuid,
- current->uid,
- audit_tty,
- current->pid);
- audit_log_format(audit_buf, " comm=");
- audit_log_untrustedstring(audit_buf, audit_comm);
- if (current->mm) {
- down_read(&current->mm->mmap_sem);
- vma = current->mm->mmap;
- while (vma) {
- if ((vma->vm_flags & VM_EXECUTABLE) &&
- vma->vm_file) {
- audit_log_d_path(audit_buf,
- " exe=",
- vma->vm_file->f_dentry,
- vma->vm_file->f_vfsmnt);
- break;
- }
- vma = vma->vm_next;
- }
- up_read(&current->mm->mmap_sem);
- }
-
- if (secid != 0 &&
- security_secid_to_secctx(secid, &secctx, &secctx_len) == 0)
+ if (audit_info->secid != 0 &&
+ security_secid_to_secctx(audit_info->secid,
+ &secctx,
+ &secctx_len) == 0)
audit_log_format(audit_buf, " subj=%s", secctx);
return audit_buf;
}
-
-/**
- * netlbl_audit_nomsg - Send an audit message without additional text
- * @type: audit message type
- * @secid: LSM context ID
- *
- * Description:
- * Send an audit message with only the common NetLabel audit fields.
- *
- */
-void netlbl_audit_nomsg(int type, u32 secid)
-{
- struct audit_buffer *audit_buf;
-
- audit_buf = netlbl_audit_start_common(type, secid);
- audit_log_end(audit_buf);
-}