summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-03-22 13:25:49 -0700
committerSage Weil <sage@inktank.com>2013-03-22 17:46:04 -0700
commit664ffa7d2178e486b00fa0706067f19b1bb9ab82 (patch)
treecc2d61068a5c5619f94ccabf959c7285ccead7f9
parent901fa435bb4be29b72cec39e5ff77570d13cbc6c (diff)
downloadceph-664ffa7d2178e486b00fa0706067f19b1bb9ab82.tar.gz
common/MemoryModel: remove logging to /tmp/memlog
This was a hack for dev purposes ages ago; remove it. The predictable filename is a security issue. CVE-2013-1882 Reported-by: Michael Scherer <misc@zarb.org> Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Dan Mick <dan.mick@inktank.com> (cherry picked from commit c524e2e01da41ab5b6362c117939ea1efbd98095)
-rw-r--r--src/common/MemoryModel.cc14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/common/MemoryModel.cc b/src/common/MemoryModel.cc
index b21ed6133bc..f737a7b88d6 100644
--- a/src/common/MemoryModel.cc
+++ b/src/common/MemoryModel.cc
@@ -97,19 +97,7 @@ void MemoryModel::_sample(snap *psnap)
psnap->malloc = mi.uordblks >> 10;
psnap->mmap = mi.hblks >> 10;
-
-
- ofstream log("/tmp/memlog", ios::app);
- log << "heap " << heap
- << "\trss " << psnap->rss
- << "\tmi\t" << mi.arena
- << "\t" << mi.ordblks
- << "\t" << mi.uordblks / 1024
- << "\t" << mi.fordblks / 1024
- << "\t" << mi.hblks
- << "\t" << mi.hblkhd / 1024
- << std::endl;
#else
-#warning "Not implemented!"
+#warning "mallinfo not implemented"
#endif
}