Subject: [PATCH] init - fix building bug and potential buffer overflow From: Cyrill Gorcunov 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 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 Acked-by: Geert Uytterhoeven Signed-off-by: Andrew Morton --- init/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/init/main.c +++ b/init/main.c @@ -703,7 +703,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) { @@ -730,11 +730,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]) {