NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace sprintf with its safe version snprintf (#5475)

Browse Source 
Summary:
sprintf is unsafe and has buffer overrun risk. Replace it with the safer version snprintf where buffer size is supplied to avoid overrun.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5475

Differential Revision: D15879481

Pulled By: sagar0

fbshipit-source-id: 7ae1958ffc9727fa50261dfbb98ddd74e70a72d8
main
Huisheng Liu 6 years ago committed by Facebook Github Bot
parent d0c6aea192
commit 92f631da33
1 changed files with 18 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 36
      tools/trace_analyzer_tool.cc

36
tools/trace_analyzer_tool.cc
Unescape View File

@ -572,7 +572,7 @@ Status TraceAnalyzer::MakeStatistics() {
// output the access count distribution // output the access count distribution
if (FLAGS_output_access_count_stats && stat.second.a_count_dist_f) { if (FLAGS_output_access_count_stats && stat.second.a_count_dist_f) {
for (auto& record : stat.second.a_count_stats) { for (auto& record : stat.second.a_count_stats) {
ret = sprintf(buffer_, "access_count: %" PRIu64 " num: %" PRIu64 "\n", ret = snprintf(buffer_, sizeof(buffer_), "access_count: %" PRIu64 " num: %" PRIu64 "\n",
record.first, record.second); record.first, record.second);
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format the output failed"); return Status::IOError("Format the output failed");
@ -596,7 +596,7 @@ Status TraceAnalyzer::MakeStatistics() {
get_mid = true; get_mid = true;
} }
if (FLAGS_output_key_distribution && stat.second.a_key_size_f) { if (FLAGS_output_key_distribution && stat.second.a_key_size_f) {
ret = sprintf(buffer_, "%" PRIu64 " %" PRIu64 "\n", record.first, ret = snprintf(buffer_, sizeof(buffer_), "%" PRIu64 " %" PRIu64 "\n", record.first,
record.second); record.second);
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format output failed"); return Status::IOError("Format output failed");
@ -624,7 +624,7 @@ Status TraceAnalyzer::MakeStatistics() {
if (FLAGS_output_value_distribution && stat.second.a_value_size_f && if (FLAGS_output_value_distribution && stat.second.a_value_size_f &&
(type == TraceOperationType::kPut || (type == TraceOperationType::kPut ||
type == TraceOperationType::kMerge)) { type == TraceOperationType::kMerge)) {
ret = sprintf(buffer_, ret = snprintf(buffer_, sizeof(buffer_),
"Number_of_value_size_between %" PRIu64 " and %" PRIu64 "Number_of_value_size_between %" PRIu64 " and %" PRIu64
" is: %" PRIu64 "\n", " is: %" PRIu64 "\n",
v_begin, v_end, record.second); v_begin, v_end, record.second);
@ -675,7 +675,7 @@ Status TraceAnalyzer::MakeStatisticKeyStatsOrPrefix(TraceStats& stats) {
succ_ratio = (static_cast<double>(record.second.succ_count)) / succ_ratio = (static_cast<double>(record.second.succ_count)) /
record.second.access_count; record.second.access_count;
} }
ret = sprintf(buffer_, "%u %zu %" PRIu64 " %" PRIu64 " %f\n", ret = snprintf(buffer_, sizeof(buffer_), "%u %zu %" PRIu64 " %" PRIu64 " %f\n",
record.second.cf_id, record.second.value_size, record.second.cf_id, record.second.value_size,
record.second.key_id, record.second.access_count, succ_ratio); record.second.key_id, record.second.access_count, succ_ratio);
if (ret < 0) { if (ret < 0) {
@ -703,7 +703,7 @@ Status TraceAnalyzer::MakeStatisticKeyStatsOrPrefix(TraceStats& stats) {
prefix_succ_ratio = prefix_succ_ratio =
(static_cast<double>(prefix_succ_access)) / prefix_access; (static_cast<double>(prefix_succ_access)) / prefix_access;
} }
ret = sprintf(buffer_, "%" PRIu64 " %" PRIu64 " %" PRIu64 " %f %f %s\n", ret = snprintf(buffer_, sizeof(buffer_), "%" PRIu64 " %" PRIu64 " %" PRIu64 " %f %f %s\n",
record.second.key_id, prefix_access, prefix_count, record.second.key_id, prefix_access, prefix_count,
prefix_ave_access, prefix_succ_ratio, prefix_out.c_str()); prefix_ave_access, prefix_succ_ratio, prefix_out.c_str());
if (ret < 0) { if (ret < 0) {
@ -809,7 +809,7 @@ Status TraceAnalyzer::MakeStatisticQPS() {
} }
if (stat.second.a_qps_f) { if (stat.second.a_qps_f) {
while (time_line < time_it.first) { while (time_line < time_it.first) {
ret = sprintf(buffer_, "%u\n", 0); ret = snprintf(buffer_, sizeof(buffer_), "%u\n", 0);
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format the output failed"); return Status::IOError("Format the output failed");
} }
@ -821,7 +821,7 @@ Status TraceAnalyzer::MakeStatisticQPS() {
} }
time_line++; time_line++;
} }
ret = sprintf(buffer_, "%u\n", time_it.second); ret = snprintf(buffer_, sizeof(buffer_), "%u\n", time_it.second);
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format the output failed"); return Status::IOError("Format the output failed");
} }
@ -870,7 +870,7 @@ Status TraceAnalyzer::MakeStatisticQPS() {
cur_ratio = (static_cast<double>(find_time->second)) / cur_uni_key; cur_ratio = (static_cast<double>(find_time->second)) / cur_uni_key;
cur_num = find_time->second; cur_num = find_time->second;
} }
ret = sprintf(buffer_, "%" PRIu64 " %.12f\n", cur_num, cur_ratio); ret = snprintf(buffer_, sizeof(buffer_), "%" PRIu64 " %.12f\n", cur_num, cur_ratio);
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format the output failed"); return Status::IOError("Format the output failed");
} }
@ -887,7 +887,7 @@ Status TraceAnalyzer::MakeStatisticQPS() {
// output the prefix of top k access peak // output the prefix of top k access peak
if (FLAGS_output_prefix_cut > 0 && stat.second.a_top_qps_prefix_f) { if (FLAGS_output_prefix_cut > 0 && stat.second.a_top_qps_prefix_f) {
while (!stat.second.top_k_qps_sec.empty()) { while (!stat.second.top_k_qps_sec.empty()) {
ret = sprintf(buffer_, "At time: %u with QPS: %u\n", ret = snprintf(buffer_, sizeof(buffer_), "At time: %u with QPS: %u\n",
stat.second.top_k_qps_sec.top().second, stat.second.top_k_qps_sec.top().second,
stat.second.top_k_qps_sec.top().first); stat.second.top_k_qps_sec.top().first);
if (ret < 0) { if (ret < 0) {
@ -906,7 +906,7 @@ Status TraceAnalyzer::MakeStatisticQPS() {
for (auto& qps_prefix : stat.second.a_qps_prefix_stats[qps_time]) { for (auto& qps_prefix : stat.second.a_qps_prefix_stats[qps_time]) {
std::string qps_prefix_out = std::string qps_prefix_out =
rocksdb::LDBCommand::StringToHex(qps_prefix.first); rocksdb::LDBCommand::StringToHex(qps_prefix.first);
ret = sprintf(buffer_, "The prefix: %s Access count: %u\n", ret = snprintf(buffer_, sizeof(buffer_), "The prefix: %s Access count: %u\n",
qps_prefix_out.c_str(), qps_prefix.second); qps_prefix_out.c_str(), qps_prefix.second);
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format the output failed"); return Status::IOError("Format the output failed");
@ -928,9 +928,9 @@ Status TraceAnalyzer::MakeStatisticQPS() {
for (uint32_t i = 0; i < duration; i++) { for (uint32_t i = 0; i < duration; i++) {
for (int type = 0; type <= kTaTypeNum; type++) { for (int type = 0; type <= kTaTypeNum; type++) {
if (type < kTaTypeNum) { if (type < kTaTypeNum) {
ret = sprintf(buffer_, "%u ", type_qps[i][type]); ret = snprintf(buffer_, sizeof(buffer_), "%u ", type_qps[i][type]);
} else { } else {
ret = sprintf(buffer_, "%u\n", type_qps[i][type]); ret = snprintf(buffer_, sizeof(buffer_), "%u\n", type_qps[i][type]);
} }
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format the output failed"); return Status::IOError("Format the output failed");
@ -959,9 +959,9 @@ Status TraceAnalyzer::MakeStatisticQPS() {
v = 0; v = 0;
} }
if (cf < cfs_size - 1) { if (cf < cfs_size - 1) {
ret = sprintf(buffer_, "%u ", v); ret = snprintf(buffer_, sizeof(buffer_), "%u ", v);
} else { } else {
ret = sprintf(buffer_, "%u\n", v); ret = snprintf(buffer_, sizeof(buffer_), "%u\n", v);
} }
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format the output failed"); return Status::IOError("Format the output failed");
@ -1016,7 +1016,7 @@ Status TraceAnalyzer::ReProcessing() {
if (found != stat.a_key_stats.end()) { if (found != stat.a_key_stats.end()) {
key_id = found->second.key_id; key_id = found->second.key_id;
} }
ret = sprintf(buffer_, "%u %" PRIu64 " %" PRIu64 "\n", ret = snprintf(buffer_, sizeof(buffer_), "%u %" PRIu64 " %" PRIu64 "\n",
stat.time_series.front().type, stat.time_series.front().type,
stat.time_series.front().ts, key_id); stat.time_series.front().ts, key_id);
if (ret < 0) { if (ret < 0) {
@ -1064,7 +1064,7 @@ Status TraceAnalyzer::ReProcessing() {
TraceStats& stat = ta_[type].stats[cf_id]; TraceStats& stat = ta_[type].stats[cf_id];
if (stat.w_key_f) { if (stat.w_key_f) {
if (stat.a_key_stats.find(input_key) != stat.a_key_stats.end()) { if (stat.a_key_stats.find(input_key) != stat.a_key_stats.end()) {
ret = sprintf(buffer_, "%" PRIu64 " %" PRIu64 "\n", ret = snprintf(buffer_, sizeof(buffer_), "%" PRIu64 " %" PRIu64 "\n",
cfs_[cf_id].w_count, cfs_[cf_id].w_count,
stat.a_key_stats[input_key].access_count); stat.a_key_stats[input_key].access_count);
if (ret < 0) { if (ret < 0) {
@ -1086,7 +1086,7 @@ Status TraceAnalyzer::ReProcessing() {
prefix[type] = input_key.substr(0, FLAGS_output_prefix_cut); prefix[type] = input_key.substr(0, FLAGS_output_prefix_cut);
std::string prefix_out = std::string prefix_out =
rocksdb::LDBCommand::StringToHex(prefix[type]); rocksdb::LDBCommand::StringToHex(prefix[type]);
ret = sprintf(buffer_, "%" PRIu64 " %s\n", cfs_[cf_id].w_count, ret = snprintf(buffer_, sizeof(buffer_), "%" PRIu64 " %s\n", cfs_[cf_id].w_count,
prefix_out.c_str()); prefix_out.c_str());
if (ret < 0) { if (ret < 0) {
return Status::IOError("Format the output failed"); return Status::IOError("Format the output failed");
@ -1904,7 +1904,7 @@ Status TraceAnalyzer::WriteTraceSequence(const uint32_t& type,
std::string hex_key = rocksdb::LDBCommand::StringToHex(key); std::string hex_key = rocksdb::LDBCommand::StringToHex(key);
int ret; int ret;
ret = ret =
sprintf(buffer_, "%u %u %zu %" PRIu64 "\n", type, cf_id, value_size, ts); snprintf(buffer_, sizeof(buffer_), "%u %u %zu %" PRIu64 "\n", type, cf_id, value_size, ts);
if (ret < 0) { if (ret < 0) {
return Status::IOError("failed to format the output"); return Status::IOError("failed to format the output");
} }

Write Preview
Loading…
Cancel
Save