Commit a3b62f8b authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by Jim Harris
Browse files

spdk_top: always use "%s"-style format for printf()-style functions 



`ncuses-6.3` added printf-style function attributes and now makes
it easier to catch cases when user input is used in palce of format
string when built with CFLAGS=-Werror=format-security:

    spdk_top.c:1135:34: error: format not a string literal and no format arguments [-Werror=format-security]
     1135 |         mvwprintw(win, row, col, tmp_str);
          |                                  ^~~~~~~

Let's wrap all the missing places with "%s" format.

Signed-off-by: default avatarSergei Trofimovich <slyich@gmail.com>
Change-Id: I84227668ff698ae2f327a7fb5d87ce0a407ab50d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10300


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent cf8a9bf2

app/spdk_top/spdk_top.c

+14 −14
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali 
		snprintf(&tmp_str[max_str - DOTS_STR_LEN - 2], DOTS_STR_LEN, "%s", dots);

	}



	mvwprintw(win, row, col, tmp_str);

	mvwprintw(win, row, col, "%s", tmp_str);



	refresh();

	wrefresh(win);
@@ -2178,7 +2178,7 @@ get_position_for_window(uint64_t window_size, uint64_t max_size) 
static void

print_bottom_error_message(char *msg)

{

	mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg);

	mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg);

}



static void
@@ -2220,14 +2220,14 @@ display_thread(struct rpc_thread_info *thread_info) 


	if (g_interval_data) {

		get_time_str(thread_info->idle - thread_info->last_idle, idle_time);

		mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);

		mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time);

		get_time_str(thread_info->busy - thread_info->last_busy, busy_time);

		mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time);

		mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time);

	} else {

		get_time_str(thread_info->idle, idle_time);

		mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);

		mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time);

		get_time_str(thread_info->busy, busy_time);

		mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time);

		mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time);

	}



	print_left(thread_win, 4, THREAD_WIN_FIRST_COL, THREAD_WIN_WIDTH,
@@ -2386,20 +2386,20 @@ show_core(uint8_t current_page) 
		get_time_str(core_info->idle, idle_time);

		get_time_str(core_info->busy, busy_time);

	}

	mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time);

	mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time);

	mvwhline(core_win, 6, 1, ACS_HLINE, CORE_WIN_WIDTH - 2);



	print_left(core_win, 7, 1, CORE_WIN_WIDTH, "Poller count:          Busy time:", COLOR_PAIR(5));

	mvwprintw(core_win, 7, CORE_WIN_FIRST_COL, "%" PRIu64,

		  core_info->pollers_count);



	mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time);

	mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time);



	mvwhline(core_win, 8, 1, ACS_HLINE, CORE_WIN_WIDTH - 2);

	print_left(core_win, 9, 1, CORE_WIN_WIDTH, "Threads on this core", COLOR_PAIR(5));



	for (i = 0; i < core_info->threads.threads_count; i++) {

		mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name);

		mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name);

	}

	pthread_mutex_unlock(&g_thread_lock);
@@ -2412,7 +2412,7 @@ show_core(uint8_t current_page) 
		pthread_mutex_lock(&g_thread_lock);

		for (i = 0; i < core_info->threads.threads_count; i++) {

			if (i != current_threads_row) {

				mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name);

				mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name);

			} else {

				print_left(core_win, i + 10, 1, CORE_WIN_WIDTH - 2,

					   core_info->threads.thread[i].name, COLOR_PAIR(2));
@@ -2493,9 +2493,9 @@ show_poller(uint8_t current_page) 
	mvwaddch(poller_win, 2, POLLER_WIN_WIDTH, ACS_RTEE);



	print_left(poller_win, 3, 2, POLLER_WIN_WIDTH, "Type:                  On thread:", COLOR_PAIR(5));

	mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL,

	mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s",

		  poller_type_str[poller->type]);

	mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name);

	mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name);



	print_left(poller_win, 4, 2, POLLER_WIN_WIDTH, "Run count:", COLOR_PAIR(5));
@@ -2510,7 +2510,7 @@ show_poller(uint8_t current_page) 
	if (poller->period_ticks != 0) {

		print_left(poller_win, 4, 28, POLLER_WIN_WIDTH, "Period:", COLOR_PAIR(5));

		get_time_str(poller->period_ticks, poller_period);

		mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period);

		mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period);

	}

	mvwhline(poller_win, 5, 1, ACS_HLINE, POLLER_WIN_WIDTH - 2);
@@ -2723,7 +2723,7 @@ show_stats(pthread_t *data_thread) 
			pthread_mutex_unlock(&g_thread_lock);



			snprintf(current_page_str, CURRENT_PAGE_STR_LEN - 1, "Page: %d/%d", current_page + 1, max_pages);

			mvprintw(g_max_row - 1, 1, current_page_str);

			mvprintw(g_max_row - 1, 1, "%s", current_page_str);



			refresh();

		}