printk: Fix log_buf_copy termination.

If idx was non-zero and the log had wrapped, len did not get truncated
to stop at the last byte written to the log.

diff --git a/kernel/printk.c b/kernel/printk.c
index 33d6dcdb4909af11f2168b152b66bbb79fe49c90..2d594092d3e16c42b33886acad2935926d974c39 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -290,8 +290,8 @@ int log_buf_copy(char *dest, int idx, int len)
        if (idx < 0 || idx >= max) {
                ret = -1;
        } else {
-               if (len > max)
-                       len = max;
+               if (len > max - idx)
+                       len = max - idx;
                ret = len;
                idx += (log_end - max);
                while (len-- > 0)