BACKPORT: block/loop: set hw_sectors

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / kernel / auditsc.c

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 63f0e495f5176655f16bbd998ed70ab600cbc64c..1138a453f4109466d9b014083b9f2c0dc3571964 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1327,6 +1327,9 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
        /* tsk == current */
        context->personality = tsk->personality;
 
+// [ SEC_SELINUX_PORTING_COMMON
+       if (context->major != __NR_setsockopt  && context->major != 294 ) {
+// ] SEC_SELINUX_PORTING_COMMON
        ab = audit_log_start(context, GFP_KERNEL, AUDIT_SYSCALL);
        if (!ab)
                return;         /* audit_panic has been called */
@@ -1435,7 +1438,9 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
        }
 
        audit_log_proctitle(tsk, context);
-
+// [ SEC_SELINUX_PORTING_COMMON
+       } // End of context->major != __NR_setsockopt
+// ] SEC_SELINUX_PORTING_COMMON
        /* Send end of event record to help user space know we are finished */
        ab = audit_log_start(context, GFP_KERNEL, AUDIT_EOE);
        if (ab)
@@ -1976,6 +1981,7 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
 {
        struct audit_buffer *ab;
        uid_t uid, oldloginuid, loginuid;
+       struct tty_struct *tty;
 
        if (!audit_enabled)
                return;
@@ -1983,14 +1989,17 @@ static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
        uid = from_kuid(&init_user_ns, task_uid(current));
        oldloginuid = from_kuid(&init_user_ns, koldloginuid);
        loginuid = from_kuid(&init_user_ns, kloginuid),
+       tty = audit_get_tty(current);
 
        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN);
        if (!ab)
                return;
        audit_log_format(ab, "pid=%d uid=%u", task_tgid_nr(current), uid);
        audit_log_task_context(ab);
-       audit_log_format(ab, " old-auid=%u auid=%u old-ses=%u ses=%u res=%d",
-                        oldloginuid, loginuid, oldsessionid, sessionid, !rc);
+       audit_log_format(ab, " old-auid=%u auid=%u tty=%s old-ses=%u ses=%u res=%d",
+                        oldloginuid, loginuid, tty ? tty_name(tty) : "(none)",
+                        oldsessionid, sessionid, !rc);
+       audit_put_tty(tty);
        audit_log_end(ab);
 }
 
@@ -2244,10 +2253,11 @@ int __audit_signal_info(int sig, struct task_struct *t)
                                audit_sig_uid = uid;
                        security_task_getsecid(tsk, &audit_sig_sid);
                }
-               if (!audit_signals || audit_dummy_context())
-                       return 0;
        }
 
+       if (!audit_signals || audit_dummy_context())
+               return 0;
+
        /* optimize the common case by putting first signal recipient directly
         * in audit_context */
        if (!ctx->target_pid) {