From: Sage Weil <sage@inktank.com>
Date: Tue, 2 Jul 2013 00:33:11 +0000 (-0700)
Subject: rgw: add RGWFormatter_Plain allocation to sidestep cranky strlen()
X-Git-Tag: v0.66~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49ff63b1750789070a8c6fef830c9526ae0f6d9f;p=ceph.git

rgw: add RGWFormatter_Plain allocation to sidestep cranky strlen()

Valgrind complains about an invalid read when we don't pad the allocation,
and because it is inlined we can't whitelist it for valgrind.  Workaround
the warning by just padding our allocations a bit.

Fixes: #5346
Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/rgw/rgw_formats.cc b/src/rgw/rgw_formats.cc
index 66704c4f5bb6..56fc7e7da080 100644
--- a/src/rgw/rgw_formats.cc
+++ b/src/rgw/rgw_formats.cc
@@ -165,7 +165,7 @@ void RGWFormatter_Plain::write_data(const char *fmt, ...)
 {
 #define LARGE_ENOUGH_LEN 128
   int n, size = LARGE_ENOUGH_LEN;
-  char s[size];
+  char s[size + 8];
   char *p, *np;
   bool p_on_stack;
   va_list ap;
@@ -187,9 +187,9 @@ void RGWFormatter_Plain::write_data(const char *fmt, ...)
     else           /* glibc 2.0 */
       size *= 2;  /* twice the old size */
     if (p_on_stack)
-      np = (char *)malloc(size);
+      np = (char *)malloc(size + 8);
     else
-      np = (char *)realloc(p, size);
+      np = (char *)realloc(p, size + 8);
     if (!np)
       goto done_free;
     p = np;