[PATCH] vsprintf: make %pV handling compatible with kasprintf()

* [PATCH] vsprintf: make %pV handling compatible with kasprintf()
@ 2012-03-05 16:49 Jan Beulich
  2012-03-05 17:02 ` Joe Perches
  0 siblings, 1 reply; 3+ messages in thread
From: Jan Beulich @ 2012-03-05 16:49 UTC (permalink / raw)
  To: akpm, Linus Torvalds; +Cc: linux-kernel

kasprintf() (and potentially other functions that I didn't run across
so far) want to evaluate argument lists twice. Caring to do so for the
primary list is obviously their job, but they can't reasonably be
expected to check the format string for instances of %pV, which however
need special handling too: On architectures like x86-64 (as opposed to
e.g. ix86), using the same argument list twice doesn't produce the
expected results, as an internally managed cursor gets updated during
the first run.

Fix the problem by always acting on a copy of the original list when
handling %pV.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

---
 lib/vsprintf.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

--- 3.3-rc6/lib/vsprintf.c
+++ 3.3-rc6-kasprintf-pV/lib/vsprintf.c
@@ -891,9 +891,15 @@ char *pointer(const char *fmt, char *buf
 	case 'U':
 		return uuid_string(buf, end, ptr, spec, fmt);
 	case 'V':
-		return buf + vsnprintf(buf, end > buf ? end - buf : 0,
-				       ((struct va_format *)ptr)->fmt,
-				       *(((struct va_format *)ptr)->va));
+		{
+			va_list va;
+
+			va_copy(va, *((struct va_format *)ptr)->va);
+			buf += vsnprintf(buf, end > buf ? end - buf : 0,
+					 ((struct va_format *)ptr)->fmt, va);
+			va_end(va);
+			return buf;
+		}
 	case 'K':
 		/*
 		 * %pK cannot be used in IRQ context because its test




^ permalink raw reply	[flat|nested] 3+ messages in thread