From 849488a953c0c98fbe5a473689bd25d5494b5927 Mon Sep 17 00:00:00 2001 From: "Alfred M. Szmidt" Date: Sun, 5 Dec 2004 14:29:43 +0000 Subject: 2004-09-08 Neal H. Walfield * linux/dev/kernel/printk.c: Include . (printk): Use vsnprintf, not linux_vsprintf to avoid buffer overruns. * kern/printf.c (struct vsnprintf_cookie): New structure. (snputc): New function. (vsnprintf): Likewise. --- kern/printf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'kern/printf.c') diff --git a/kern/printf.c b/kern/printf.c index 85e6278..e6478ae 100644 --- a/kern/printf.c +++ b/kern/printf.c @@ -579,6 +579,34 @@ sprintf(char *buf, const char *fmt, ...) return (buf - start); } +struct vsnprintf_cookie +{ + char *buf; + int index; + int max_len; +}; + +static void +snputc(char c, vm_offset_t arg) +{ + struct vsnprintf_cookie *cookie = (void *) arg; + + if (cookie->index < cookie->max_len) + cookie->buf[cookie->index ++] = c; +} + +int +vsnprintf(char *buf, int size, const char *fmt, va_list args) +{ + struct vsnprintf_cookie cookie + = { .buf = buf, .index = 0, .max_len = size }; + + _doprnt (fmt, &args, snputc, 16, (vm_offset_t)&cookie); + cookie.buf[cookie.index] = '\0'; + + return cookie.index; +} + void safe_gets(str, maxlen) char *str; -- cgit v1.2.3