The patch titled
drivers/cdrom/*: trivial vsnprintf() conversion
has been added to the -mm tree. Its filename is
drivers-cdrom-trivial-vsnprintf-conversion.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: drivers/cdrom/*: trivial vsnprintf() conversion
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Fixing sbpcd.c baroque error printing in process.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/cdrom/optcd.c | 2 +-
drivers/cdrom/sbpcd.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff -puN drivers/cdrom/optcd.c~drivers-cdrom-trivial-vsnprintf-conversion drivers/cdrom/optcd.c
--- a/drivers/cdrom/optcd.c~drivers-cdrom-trivial-vsnprintf-conversion
+++ a/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);
}
diff -puN drivers/cdrom/sbpcd.c~drivers-cdrom-trivial-vsnprintf-conversion drivers/cdrom/sbpcd.c
--- a/drivers/cdrom/sbpcd.c~drivers-cdrom-trivial-vsnprintf-conversion
+++ a/drivers/cdrom/sbpcd.c
@@ -770,11 +770,10 @@ static void msg(int level, const char *f
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 */
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
git-gfs2.patch
git-ieee1394.patch
git-mtd.patch
git-netdev-all.patch
parisc-use-unsigned-long-flags-in-semaphore-code.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
security-keys-user-kmemdup.patch
paride-rename-pi_register-and-pi_unregister.patch
paride_register-shuffle-return-values.patch
enforce-unsigned-long-flags-when-spinlocking.patch
compile-time-check-re-world-writeable-module-params.patch
drivers-video-use-kmemdup.patch
fs-trivial-vsnprintf-conversion.patch
hpfs-bring-hpfs_error-into-shape.patch
drivers-cdrom-trivial-vsnprintf-conversion.patch
drivers-isdn-trivial-vsnprintf-conversion.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
