From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org
Subject: [PATCH 13/13] lib/kasprintf.c: add sanity check to kvasprintf
Date: Tue, 20 Oct 2015 22:30:13 +0200 [thread overview]
Message-ID: <1445373013-20207-14-git-send-email-linux@rasmusvillemoes.dk> (raw)
In-Reply-To: <1445373013-20207-1-git-send-email-linux@rasmusvillemoes.dk>
kasprintf relies on being able to replay the formatting and getting
the same result (in particular, the same length). This will almost
always work, but it is possible that the object pointed to by a %s or
%p argument changed under us (so we might get truncated output). Add a
somewhat paranoid sanity check and let's see if it ever triggers.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
lib/kasprintf.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/kasprintf.c b/lib/kasprintf.c
index 32f12150fc4f..a30bf3042020 100644
--- a/lib/kasprintf.c
+++ b/lib/kasprintf.c
@@ -13,19 +13,21 @@
/* Simplified asprintf. */
char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
{
- unsigned int len;
+ unsigned int first, second;
char *p;
va_list aq;
va_copy(aq, ap);
- len = vsnprintf(NULL, 0, fmt, aq);
+ first = vsnprintf(NULL, 0, fmt, aq);
va_end(aq);
- p = kmalloc_track_caller(len+1, gfp);
+ p = kmalloc_track_caller(first+1, gfp);
if (!p)
return NULL;
- vsnprintf(p, len+1, fmt, ap);
+ second = vsnprintf(p, first+1, fmt, ap);
+ WARN(first != second, "different return values (%u and %u) from vsnprintf(\"%s\", ...)",
+ first, second, fmt);
return p;
}
--
2.6.1
prev parent reply other threads:[~2015-10-20 20:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1445373013-20207-1-git-send-email-linux@rasmusvillemoes.dk>
2015-10-20 20:30 ` [PATCH 01/13] lib/vsprintf.c: pull out padding code from dentry_name() Rasmus Villemoes
2015-10-20 20:30 ` [PATCH 02/13] lib/vsprintf.c: move string() below widen_string() Rasmus Villemoes
2015-10-20 20:30 ` [PATCH 03/13] lib/vsprintf.c: eliminate potential race in string() Rasmus Villemoes
2015-10-20 20:30 ` [PATCH 04/13] lib/vsprintf.c: expand field_width to 24 bits Rasmus Villemoes
2015-10-20 23:39 ` kbuild test robot
2015-10-21 8:54 ` Rasmus Villemoes
2015-10-21 8:59 ` [PATCH v2 " Rasmus Villemoes
2015-12-01 23:38 ` [PATCH " Andrew Morton
2015-12-13 0:46 ` Andy Shevchenko
2015-10-20 20:30 ` [PATCH 05/13] lib/vsprintf.c: help gcc make number() smaller Rasmus Villemoes
2015-10-20 20:30 ` [PATCH 06/13] lib/vsprintf.c: warn about too large precisions and field widths Rasmus Villemoes
2015-10-20 20:30 ` [PATCH 07/13] lib/test_printf.c: don't BUG Rasmus Villemoes
2015-10-26 6:39 ` Kees Cook
2015-10-20 20:30 ` [PATCH 08/13] lib/test_printf.c: check for out-of-bound writes Rasmus Villemoes
2015-10-26 6:41 ` Kees Cook
2015-10-20 20:30 ` [PATCH 09/13] lib/test_printf.c: add a few string tests Rasmus Villemoes
2015-10-26 6:43 ` Kees Cook
2015-10-20 20:30 ` [PATCH 10/13] lib/test_printf.c: account for kvasprintf tests Rasmus Villemoes
2015-10-26 6:43 ` Kees Cook
2015-10-20 20:30 ` [PATCH 11/13] lib/test_printf.c: add test for large bitmaps Rasmus Villemoes
2015-10-26 6:45 ` Kees Cook
2015-10-20 20:30 ` [PATCH 12/13] lib/test_printf.c: test dentry printing Rasmus Villemoes
2015-10-20 20:30 ` Rasmus Villemoes [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445373013-20207-14-git-send-email-linux@rasmusvillemoes.dk \
--to=linux@rasmusvillemoes.dk \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®