1 files changed, 10 insertions, 5 deletions

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 4dae9cbe9259..a45b50962295 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -319,7 +319,7 @@ static void log_store(int facility, int level,
                 else
                         free = log_first_idx - log_next_idx;
 
-                if (free > size + sizeof(struct printk_log))
+                if (free >= size + sizeof(struct printk_log))
                         break;
 
                 /* drop old messages until we have enough contiuous space */
@@ -327,7 +327,7 @@ static void log_store(int facility, int level,
                 log_first_seq++;
         }
 
-        if (log_next_idx + size + sizeof(struct printk_log) >= log_buf_len) {
+        if (log_next_idx + size + sizeof(struct printk_log) > log_buf_len) {
                 /*
                  * This message + an additional empty header does not fit
                  * at the end of the buffer. Add an empty header with len == 0
@@ -351,7 +351,7 @@ static void log_store(int facility, int level,
         else
                 msg->ts_nsec = local_clock();
         memset(log_dict(msg) + dict_len, 0, pad_len);
-        msg->len = sizeof(struct printk_log) + text_len + dict_len + pad_len;
+        msg->len = size;
 
         /* insert message */
         log_next_idx += msg->len;
@@ -1560,9 +1560,12 @@ asmlinkage int vprintk_emit(int facility, int level,
                                         level = kern_level - '0';
                         case 'd':       /* KERN_DEFAULT */
                                 lflags |= LOG_PREFIX;
-                        case 'c':       /* KERN_CONT */
-                                break;
                         }
+                        /*
+                         * No need to check length here because vscnprintf
+                         * put '\0' at the end of the string. Only valid and
+                         * newly printed level is detected.
+                         */
                         text_len -= end_of_header - text;
                         text = (char *)end_of_header;
                 }
@@ -1880,6 +1883,7 @@ void suspend_console(void)
         console_lock();
         console_suspended = 1;
         up(&console_sem);
+        mutex_release(&console_lock_dep_map, 1, _RET_IP_);
 }
 
 void resume_console(void)
@@ -1887,6 +1891,7 @@ void resume_console(void)
         if (!console_suspend_enabled)
                 return;
         down(&console_sem);
+        mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_);
         console_suspended = 0;
         console_unlock();
 }