From f5d992bf14b51d323b406f02e6573bcd214ec3f0 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 17 Dec 2015 14:35:42 +0000 Subject: [PATCH] scst_debug(): Avoid that debug_print_with_prefix() overflows the output buffer (merge r6339 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6745 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scst/src/scst_debug.c b/scst/src/scst_debug.c index 31632c163..491004475 100644 --- a/scst/src/scst_debug.c +++ b/scst/src/scst_debug.c @@ -75,11 +75,11 @@ int debug_print_with_prefix(unsigned long trace_flag, const char *severity, spin_lock_irqsave(&trace_buf_lock, flags); - strcpy(trace_buf, severity); + strlcpy(trace_buf, severity, TRACE_BUF_SIZE); i = strlen(trace_buf); if (trace_flag & TRACE_PID) - i += snprintf(&trace_buf[i], TRACE_BUF_SIZE, "[%d]: ", pid); + i += snprintf(&trace_buf[i], TRACE_BUF_SIZE - i, "[%d]: ", pid); if (prefix != NULL) i += snprintf(&trace_buf[i], TRACE_BUF_SIZE - i, "%s: ", prefix);