[ERD][NEUS7920-76] [COMMON] lib: dss: support to output notifier call functions

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / kernel / auditsc.c

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index aac1a41f82bd78d3fed70a048abf348d4b07b941..76d789d6cea060a4e7d85901f22e5752764a915b 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -471,6 +471,8 @@ static int audit_filter_rules(struct task_struct *tsk,
                        break;
                case AUDIT_EXE:
                        result = audit_exe_compare(tsk, rule->exe);
+                       if (f->op == Audit_not_equal)
+                               result = !result;
                        break;
                case AUDIT_UID:
                        result = audit_uid_comparator(cred->uid, f->op, f->uid);
@@ -1235,11 +1237,11 @@ static void show_special(struct audit_context *context, int *call_panic)
        case AUDIT_MQ_SENDRECV:
                audit_log_format(ab,
                        "mqdes=%d msg_len=%zd msg_prio=%u "
-                       "abs_timeout_sec=%ld abs_timeout_nsec=%ld",
+                       "abs_timeout_sec=%lld abs_timeout_nsec=%ld",
                        context->mq_sendrecv.mqdes,
                        context->mq_sendrecv.msg_len,
                        context->mq_sendrecv.msg_prio,
-                       context->mq_sendrecv.abs_timeout.tv_sec,
+                       (long long) context->mq_sendrecv.abs_timeout.tv_sec,
                        context->mq_sendrecv.abs_timeout.tv_nsec);
                break;
        case AUDIT_MQ_NOTIFY:
@@ -1272,8 +1274,12 @@ static void show_special(struct audit_context *context, int *call_panic)
                break;
        case AUDIT_KERN_MODULE:
                audit_log_format(ab, "name=");
-               audit_log_untrustedstring(ab, context->module.name);
-               kfree(context->module.name);
+               if (context->module.name) {
+                       audit_log_untrustedstring(ab, context->module.name);
+                       kfree(context->module.name);
+               } else
+                       audit_log_format(ab, "(null)");
+
                break;
        }
        audit_log_end(ab);
@@ -2083,15 +2089,15 @@ void __audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr)
  *
  */
 void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int msg_prio,
-                       const struct timespec *abs_timeout)
+                       const struct timespec64 *abs_timeout)
 {
        struct audit_context *context = current->audit_context;
-       struct timespec *p = &context->mq_sendrecv.abs_timeout;
+       struct timespec64 *p = &context->mq_sendrecv.abs_timeout;
 
        if (abs_timeout)
-               memcpy(p, abs_timeout, sizeof(struct timespec));
+               memcpy(p, abs_timeout, sizeof(*p));
        else
-               memset(p, 0, sizeof(struct timespec));
+               memset(p, 0, sizeof(*p));
 
        context->mq_sendrecv.mqdes = mqdes;
        context->mq_sendrecv.msg_len = msg_len;
@@ -2385,8 +2391,9 @@ void __audit_log_kern_module(char *name)
 {
        struct audit_context *context = current->audit_context;
 
-       context->module.name = kmalloc(strlen(name) + 1, GFP_KERNEL);
-       strcpy(context->module.name, name);
+       context->module.name = kstrdup(name, GFP_KERNEL);
+       if (!context->module.name)
+               audit_log_lost("out of memory in __audit_log_kern_module");
        context->type = AUDIT_KERN_MODULE;
 }