Messages in this thread Patch in this message | | | Date | Wed, 1 Nov 2006 05:12:31 +0300 | From | Alexey Dobriyan <> | Subject | [PATCH] drivers/cdrom/*: trivial vsnprintf() conversion |
| |
Fixing sbpcd.c baroque error printing in process.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> ---
drivers/cdrom/optcd.c | 2 +- drivers/cdrom/sbpcd.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
--- a/drivers/cdrom/optcd.c +++ b/drivers/cdrom/optcd.c @@ -101,7 +101,7 @@ static void debug(int debug_this, const return; va_start(args, fmt); - vsprintf(s, fmt, args); + vsnprintf(s, sizeof(s), fmt, args); printk(KERN_DEBUG "optcd: %s\n", s); va_end(args); } --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c @@ -770,11 +770,10 @@ #endif /* DISTRIBUTION */ msgnum++; if (msgnum>99) msgnum=0; - sprintf(buf, MSG_LEVEL "%s-%d [%02d]: ", major_name, current_drive - D_S, msgnum); va_start(args, fmt); - vsprintf(&buf[18], fmt, args); + vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); - printk(buf); + printk(MSG_LEVEL "%s-%d [%02d]: %s", major_name, current_drive - D_S, msgnum, buf); #if KLOGD_PAUSE sbp_sleep(KLOGD_PAUSE); /* else messages get lost */ #endif /* KLOGD_PAUSE */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |