diff options
| author | Arve Hjønnevåg <arve@android.com> | 2008-04-14 21:35:25 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-09 13:57:47 -0700 |
| commit | ee51cfa5c81f66ec296996c16bc3516ecdb20993 (patch) | |
| tree | c5bbca85f4d31bce16f83a21b686019cf258fbff /kernel/printk.c | |
| parent | 572b262cd341fb0b112ca9482910d53593c1e0e5 (diff) | |
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.
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 5841d34101e..5c3880d58f2 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -322,8 +322,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) |