These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / security / lsm_audit.c

diff --git a/kernel/security/lsm_audit.c b/kernel/security/lsm_audit.c
index 1d34277..cccbf30 100644 (file)
--- a/kernel/security/lsm_audit.c
+++ b/kernel/security/lsm_audit.c
@@ -245,6 +245,21 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                }
                break;
        }
+       case LSM_AUDIT_DATA_IOCTL_OP: {
+               struct inode *inode;
+
+               audit_log_d_path(ab, " path=", &a->u.op->path);
+
+               inode = a->u.op->path.dentry->d_inode;
+               if (inode) {
+                       audit_log_format(ab, " dev=");
+                       audit_log_untrustedstring(ab, inode->i_sb->s_id);
+                       audit_log_format(ab, " ino=%lu", inode->i_ino);
+               }
+
+               audit_log_format(ab, " ioctlcmd=%hx", a->u.op->cmd);
+               break;
+       }
        case LSM_AUDIT_DATA_DENTRY: {
                struct inode *inode;
 
@@ -282,7 +297,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                        pid_t pid = task_pid_nr(tsk);
                        if (pid) {
                                char comm[sizeof(tsk->comm)];
-                               audit_log_format(ab, " pid=%d comm=", pid);
+                               audit_log_format(ab, " opid=%d ocomm=", pid);
                                audit_log_untrustedstring(ab,
                                    memcpy(comm, tsk->comm, sizeof(comm)));
                        }