summaryrefslogtreecommitdiffstats
path: root/target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-14 20:42:33 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-14 20:42:33 +0000
commit2d581e604771771dd63946cbed17d6b7ec79bd9d (patch)
tree74597f2d6eef2e7a6d6338c978b8910f9f947151 /target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch
parent8378beaa85ae5e6951d9a7a6c7d1928f5d150653 (diff)
add the 'goldfish' target, useful for experimenting with virtual phone hardware (includes the emulator)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16459 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch')
-rw-r--r--target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch b/target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch
new file mode 100644
index 000000000..3956090cb
--- /dev/null
+++ b/target/linux/goldfish/patches-2.6.30/0110-printk-Fix-log_buf_copy-termination.patch
@@ -0,0 +1,24 @@
+From e500cd364086cfc018b100d08c97b2fdf229d029 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com>
+Date: Mon, 14 Apr 2008 21:35:25 -0700
+Subject: [PATCH 110/134] 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.
+---
+ kernel/printk.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/printk.c
++++ b/kernel/printk.c
+@@ -279,8 +279,8 @@ int log_buf_copy(char *dest, int idx, in
+ 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)