The patch titled
init: fix build and potential buffer overflow
has been removed from the -mm tree. Its filename was
init-fix-building-bug-and-potential-buffer-overflow.patch
This patch was dropped because it is obsolete
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: init: fix build and potential buffer overflow
From: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
This patch fixes a build bug on m68k - gcc decides to emit a call to the
strlen library function, which we don't implement. Use strlcat() instead.
What is more important - my previous patch
commit e662e1cfd434aa234b72fbc781f1d70211cb785b
Author: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Date: Mon May 12 14:02:22 2008 -0700
init: don't lose initcall return values
Has introduced potential buffer overflow by wrong calculation of string
accumulator size.
Many thanks Andreas Schwab and Geert Uytterhoeven for helping
to catch and fix the bug.
Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
init/main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN init/main.c~init-fix-building-bug-and-potential-buffer-overflow init/main.c
--- a/init/main.c~init-fix-building-bug-and-potential-buffer-overflow
+++ a/init/main.c
@@ -702,7 +702,7 @@ static void __init do_initcalls(void)
for (call = __initcall_start; call < __initcall_end; call++) {
ktime_t t0, t1, delta;
- char msgbuf[40];
+ char msgbuf[64];
int result;
if (initcall_debug) {
@@ -729,11 +729,11 @@ static void __init do_initcalls(void)
sprintf(msgbuf, "error code %d ", result);
if (preempt_count() != count) {
- strncat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
+ strlcat(msgbuf, "preemption imbalance ", sizeof msgbuf);
preempt_count() = count;
}
if (irqs_disabled()) {
- strncat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
+ strlcat(msgbuf, "disabled interrupts ", sizeof msgbuf);
local_irq_enable();
}
if (msgbuf[0]) {
_
Patches currently in -mm which might be from gorcunov@xxxxxxxxx are
origin.patch
init-fix-building-bug-and-potential-buffer-overflow.patch
linux-next.patch
module-loading-elf-handling-use-selfmag-instead-of-numeric-constant.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
